Module Name: src
Committed By: christos
Date: Mon Jan 15 17:35:48 UTC 2024
Modified Files:
src/usr.bin/gzip: gzip.c
Log Message:
PR/57858: Ricardo Branco: Print the full pathname on errors.
from FreeBSD https://github.com/NetBSD/src/pull/25
To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 src/usr.bin/gzip/gzip.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/gzip/gzip.c
diff -u src/usr.bin/gzip/gzip.c:1.120 src/usr.bin/gzip/gzip.c:1.121
--- src/usr.bin/gzip/gzip.c:1.120 Sun Jan 14 13:12:59 2024
+++ src/usr.bin/gzip/gzip.c Mon Jan 15 12:35:48 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: gzip.c,v 1.120 2024/01/14 18:12:59 mrg Exp $ */
+/* $NetBSD: gzip.c,v 1.121 2024/01/15 17:35:48 christos Exp $ */
/*
* Copyright (c) 1997, 1998, 2003, 2004, 2006, 2008, 2009, 2010, 2011, 2015, 2017
@@ -31,7 +31,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1997, 1998, 2003, 2004, 2006, 2008,\
2009, 2010, 2011, 2015, 2017 Matthew R. Green. All rights reserved.");
-__RCSID("$NetBSD: gzip.c,v 1.120 2024/01/14 18:12:59 mrg Exp $");
+__RCSID("$NetBSD: gzip.c,v 1.121 2024/01/15 17:35:48 christos Exp $");
#endif /* not lint */
/*
@@ -2037,7 +2037,7 @@ handle_dir(char *dir)
path_argv[0] = dir;
path_argv[1] = 0;
- fts = fts_open(path_argv, FTS_PHYSICAL, NULL);
+ fts = fts_open(path_argv, FTS_PHYSICAL | FTS_NOCHDIR, NULL);
if (fts == NULL) {
warn("couldn't fts_open %s", dir);
return;
@@ -2055,7 +2055,7 @@ handle_dir(char *dir)
maybe_warn("%s", entry->fts_path);
continue;
case FTS_F:
- handle_file(entry->fts_name, entry->fts_statp);
+ handle_file(entry->fts_path, entry->fts_statp);
}
}
(void)fts_close(fts);
