rpms/findutils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- new upstream release, dropped applied patches

Browse Source
This commit is contained in:
Kamil Dudka 2010-05-05 11:38:25 +00:00
parent 8440b32a33
commit 6dba51f96d
9 changed files with 45 additions and 730 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
findutils-4.5.7.tar.gz findutils-4.5.9.tar.gz

53
findutils-4.4.2-xautofs.patch
View File

@ -1,3 +1,11 @@
doc/find.texi | 4 ++++
find/defs.h | 3 +++
find/find.1 | 3 +++
find/ftsfind.c | 6 ++++++
find/parser.c | 9 +++++++++
find/util.c | 1 +
6 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/doc/find.texi b/doc/find.texi diff --git a/doc/find.texi b/doc/find.texi
index b509f66..3ce5b1e 100644 index b509f66..3ce5b1e 100644
--- a/doc/find.texi --- a/doc/find.texi
@ -14,15 +22,15 @@ index b509f66..3ce5b1e 100644
@deffnx Option -mount @deffnx Option -mount
Don't descend directories on other filesystems. These options are Don't descend directories on other filesystems. These options are
diff --git a/find/defs.h b/find/defs.h diff --git a/find/defs.h b/find/defs.h
index f344f97..4ade8f4 100644 index 11d1d00..da3ff96 100644
--- a/find/defs.h --- a/find/defs.h
+++ b/find/defs.h +++ b/find/defs.h
@@ -562,6 +562,9 @@ struct options @@ -561,6 +561,9 @@ struct options
/* If true, don't cross filesystem boundaries. */ /* If true, don't cross filesystem boundaries. */
boolean stay_on_filesystem; bool stay_on_filesystem;
+ /* If true, don't descend directories on autofs filesystems. */ + /* If true, don't descend directories on autofs filesystems. */
+ boolean bypass_autofs; + bool bypass_autofs;
+ +
/* If true, we ignore the problem where we find that a directory entry /* If true, we ignore the problem where we find that a directory entry
* no longer exists by the time we get around to processing it. * no longer exists by the time we get around to processing it.
@ -42,10 +50,10 @@ index 5da6ddf..82dc802 100644
Don't descend directories on other filesystems. Don't descend directories on other filesystems.
diff --git a/find/ftsfind.c b/find/ftsfind.c diff --git a/find/ftsfind.c b/find/ftsfind.c
index c3681f6..b3a08f9 100644 index 9fdb8ef..bd7cc37 100644
--- a/find/ftsfind.c --- a/find/ftsfind.c
+++ b/find/ftsfind.c +++ b/find/ftsfind.c
@@ -524,6 +524,12 @@ consider_visiting (FTS *p, FTSENT *ent) @@ -485,6 +485,12 @@ consider_visiting (FTS *p, FTSENT *ent)
} }
} }
@ -59,17 +67,17 @@ index c3681f6..b3a08f9 100644
{ {
/* this is the preorder visit, but user said -depth */ /* this is the preorder visit, but user said -depth */
diff --git a/find/parser.c b/find/parser.c diff --git a/find/parser.c b/find/parser.c
index 2ea3126..8238671 100644 index 3da5721..e99caff 100644
--- a/find/parser.c --- a/find/parser.c
+++ b/find/parser.c +++ b/find/parser.c
@@ -153,6 +153,7 @@ static boolean parse_user PARAMS((const struct parser_table*, char *arg @@ -151,6 +151,7 @@ static bool parse_user (const struct parser_table*, char *argv[], int *
static boolean parse_version PARAMS((const struct parser_table*, char *argv[], int *arg_ptr)); static bool parse_version (const struct parser_table*, char *argv[], int *arg_ptr);
static boolean parse_wholename PARAMS((const struct parser_table*, char *argv[], int *arg_ptr)); static bool parse_wholename (const struct parser_table*, char *argv[], int *arg_ptr);
static boolean parse_xdev PARAMS((const struct parser_table*, char *argv[], int *arg_ptr)); static bool parse_xdev (const struct parser_table*, char *argv[], int *arg_ptr);
+static boolean parse_xautofs PARAMS((const struct parser_table*, char *argv[], int *arg_ptr)); +static bool parse_xautofs (const struct parser_table*, char *argv[], int *arg_ptr);
static boolean parse_ignore_race PARAMS((const struct parser_table*, char *argv[], int *arg_ptr)); static bool parse_ignore_race (const struct parser_table*, char *argv[], int *arg_ptr);
static boolean parse_noignore_race PARAMS((const struct parser_table*, char *argv[], int *arg_ptr)); static bool parse_noignore_race (const struct parser_table*, char *argv[], int *arg_ptr);
static boolean parse_warn PARAMS((const struct parser_table*, char *argv[], int *arg_ptr)); static bool parse_warn (const struct parser_table*, char *argv[], int *arg_ptr);
@@ -325,6 +326,7 @@ static struct parser_table const parse_table[] = @@ -325,6 +326,7 @@ static struct parser_table const parse_table[] =
PARSE_TEST_NP ("wholename", wholename), /* GNU, replaced -path, but anyway -path will soon be in POSIX */ PARSE_TEST_NP ("wholename", wholename), /* GNU, replaced -path, but anyway -path will soon be in POSIX */
{ARG_TEST, "writable", parse_accesscheck, pred_writable}, /* GNU, 4.3.0+ */ {ARG_TEST, "writable", parse_accesscheck, pred_writable}, /* GNU, 4.3.0+ */
@ -78,28 +86,25 @@ index 2ea3126..8238671 100644
PARSE_TEST ("xtype", xtype), /* GNU */ PARSE_TEST ("xtype", xtype), /* GNU */
#ifdef UNIMPLEMENTED_UNIX #ifdef UNIMPLEMENTED_UNIX
/* It's pretty ugly for find to know about archive formats. /* It's pretty ugly for find to know about archive formats.
@@ -2795,6 +2797,16 @@ parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr) @@ -2795,6 +2797,13 @@ parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr)
} }
static boolean static bool
+parse_xautofs (const struct parser_table* entry, char **argv, int *arg_ptr) +parse_xautofs (const struct parser_table* entry, char **argv, int *arg_ptr)
+{ +{
+ (void) argv;
+ (void) arg_ptr;
+ (void) entry;
+ options.bypass_autofs = true; + options.bypass_autofs = true;
+ return true; + return parse_noop (entry, argv, arg_ptr);
+} +}
+ +
+static boolean +static bool
parse_ignore_race (const struct parser_table* entry, char **argv, int *arg_ptr) parse_ignore_race (const struct parser_table* entry, char **argv, int *arg_ptr)
{ {
options.ignore_readdir_race = true; options.ignore_readdir_race = true;
diff --git a/find/util.c b/find/util.c diff --git a/find/util.c b/find/util.c
index 11e8eed..3761a61 100644 index 8577396..4d45f84 100644
--- a/find/util.c --- a/find/util.c
+++ b/find/util.c +++ b/find/util.c
@@ -999,6 +999,7 @@ set_option_defaults (struct options *p) @@ -1006,6 +1006,7 @@ set_option_defaults (struct options *p)
p->full_days = false; p->full_days = false;
p->stay_on_filesystem = false; p->stay_on_filesystem = false;

586
findutils-4.5.7-bz579476.patch
View File

@ -1,586 +0,0 @@
ChangeLog | 74 ++++++++++++++++++++++++++++++++++++++++++++++++
NEWS | 1 +
find/defs.h | 12 ++++++-
find/find.c | 8 +++--
find/ftsfind.c | 53 ++++++++++++++++------------------
find/parser.c | 10 +++---
find/pred.c | 8 ++--
find/sharefile.c | 2 +-
find/tree.c | 1 +
find/util.c | 83 ++++++++++++++++++++++++++++++++++++++++++-----------
10 files changed, 191 insertions(+), 61 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index abe1993..8bcae9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,77 @@
+ 2010-04-05 James Youngman <jay@gnu.org>
+
+ Don't issue an error message twice for the same target file.
+ * find/defs.h (struct state): New member,
+ already_issued_stat_error_msg, used to de-duplicate error
+ messages. If it is true, we already issued an error message for
+ the current target file.
+ Declare fatal_target_file_error, fatal_nontarget_file_error,
+ nonfatal_target_file_error, nonfatal_nontarget_file_error.
+ Between them, they replace fatal_file_error and
+ nonfatal_file_error. The *target_file_error versions are
+ de-duplicated and the nontarget_file_error_versions are not.
+ * find/util.c (nonfatal_nontarget_file_error): Implement.
+ (fatal_nontarget_file_error): Implement.
+ (nonfatal_target_file_error): Implement.
+ (fatal_target_file_error): Implement.
+ (fatal_file_error): Remove.
+ (nonfatal_file_error): Remove.
+ (error_severity): Define error_severity (moved from ftsfind.c)
+ (get_statinfo): Call nonfatal_target_file_error in order to avoid
+ a duplicate message. ALso call error_severity after a different
+ call to error to preserve the constraint that we exit with a
+ nonzero status if we issue a diagnostic.
+ (cleanup): Call nonfatal_nontarget_file_error instead of
+ nonfatal_file_error.
+ * find/tree.c (build_expression_tree): Initialise
+ state.already_issued_stat_error_msg.
+ * find/find.c (main): Initialise state.already_issued_stat_error_msg.
+ (wd_sanity_check): Call fatal_target_file_error instead of
+ fatal_file_error.
+ (chdir_back): Call fatal_nontarget_file_error instead of
+ fatal_file_error.
+ (process_path): Initialise state.already_issued_stat_error_msg.
+ * find/ftsfind.c (consider_visiting): Call
+ nonfatal_target_file_error instead of calling error directly.
+ (find): Call error_severity to ensure exit status is nonzero after
+ a call to error.
+ (main): Initialise state.already_issued_stat_error_msg.
+ (error_severity): Move to util.c.
+ * find/parser.c (collect_arg_stat_info): Call
+ fatal_target_file_error instead of fatal_file_error.
+ (parse_newerXY): Likewise.
+ (parse_samefile): Likewise.
+ (parse_samefile): Likewise.
+ (open_output_file): Call fatal_nontarget_file_error instead of
+ fatal_file_error.
+ * find/pred.c (checked_fprintf): Likewise.
+ (checked_print_quoted): Likewise.
+ (checked_fwrite): Likewise.
+ (checked_fflush): Likewise.
+ * find/sharefile.c (entry_free): Likewise.
+
+ Fix Savannah bug #29435: fd_is_cloexec does not work on Fedora
+ buildhosts.
+ Fix open_cloexec on hosts which ignore O_CLOEXEC (i.e. old kernels).
+ * lib/fdleak.c (o_cloexec_works): New function, detects whether
+ the open flag O_CLOEXEC has any effect.
+ (open_cloexec): Call o_cloexec_works, just once, to find out
+ whether O_CLOEXEC is effective. If not, set the close-on-exec
+ flag on fds by calling set_cloexec_flag.
+ * NEWS: Mention this bugfix.
+
+2010-04-04 Martin von Gagern <Martin.vGagern@gmx.net>
+
+ Fix Savannah bug #27213: avoid failed assertions for
+ non-executable directories.
+ (consider_visiting): Continue (after issuing an error message)
+ even if ent->fts_info == FTS_NS.
+ * find/util.c (get_statinfo): If we cannot stat the file, issue a
+ diagnostic, but continue anyway.
+ * find/ftsfind.c (consider_visiting): Don't assert-fail if
+ ent->fts_info == FTS_NSOK. Don't assert-fail if state.type is
+ nonzero.
+
2010-04-04 James Youngman <jay@gnu.org>
Fix Savannah bug #29435: fd_is_cloexec does not work on Fedora
diff --git a/NEWS b/NEWS
index e171b87..3f81b88 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ GNU findutils NEWS - User visible changes. -*- outline -*- (allout)
#29435: fd_is_cloexec does not work on Fedora buildhosts
+#27213: avoid failed assertions for non-executable directories.
* Major changes in release 4.5.7, 2010-04-03
diff --git a/find/defs.h b/find/defs.h
index 4ade8f4..b2e255a 100644
--- a/find/defs.h
+++ b/find/defs.h
@@ -504,11 +504,16 @@ extern boolean check_nofollow(void);
void complete_pending_execs(struct predicate *p);
void complete_pending_execdirs(int dir_fd); /* Passing dir_fd is an unpleasant CodeSmell. */
const char *safely_quote_err_filename (int n, char const *arg);
-void fatal_file_error(const char *name) ATTRIBUTE_NORETURN;
-void nonfatal_file_error(const char *name);
+
+void fatal_target_file_error (int errno_value, const char *name) ATTRIBUTE_NORETURN;
+void fatal_nontarget_file_error (int errno_value, const char *name) ATTRIBUTE_NORETURN;
+void nonfatal_target_file_error (int erron_value, const char *name);
+void nonfatal_nontarget_file_error (int erron_value, const char *name);
+
int process_leading_options PARAMS((int argc, char *argv[]));
void set_option_defaults PARAMS((struct options *p));
+void error_severity PARAMS((int level));
#if 0
#define apply_predicate(pathname, stat_buf_ptr, node) \
@@ -669,6 +674,9 @@ struct state
/* Shared files, opened via the interface in sharefile.h. */
sharefile_handle shared_files;
+
+ /* Avoid multiple error messages for the same file. */
+ boolean already_issued_stat_error_msg;
};
/* finddata.c */
diff --git a/find/find.c b/find/find.c
index 336e120..e058814 100644
--- a/find/find.c
+++ b/find/find.c
@@ -135,6 +135,7 @@ main (int argc, char **argv)
remember_non_cloexec_fds ();
}
+ state.already_issued_stat_error_msg = false;
state.shared_files = sharefile_init ("w");
if (NULL == state.shared_files)
{
@@ -472,7 +473,7 @@ wd_sanity_check (const char *thing_to_stat,
set_stat_placeholders (newinfo);
if ((*options.xstat) (current_dir, newinfo) != 0)
- fatal_file_error (thing_to_stat);
+ fatal_target_file_error (errno, thing_to_stat);
if (old_dev != newinfo->st_dev)
{
@@ -943,7 +944,7 @@ chdir_back (void)
#endif
if (chdir (starting_dir) != 0)
- fatal_file_error (starting_dir);
+ fatal_nontarget_file_error (errno, starting_dir);
wd_sanity_check (starting_dir,
program_name,
@@ -962,7 +963,7 @@ chdir_back (void)
if (fchdir (starting_desc) != 0)
{
- fatal_file_error (starting_dir);
+ fatal_nontarget_file_error (errno, starting_dir);
}
}
}
@@ -1183,6 +1184,7 @@ process_path (char *pathname, char *name, boolean leaf, char *parent,
state.type = 0;
state.have_stat = false;
state.have_type = false;
+ state.already_issued_stat_error_msg = false;
if (!digest_mode (&mode, pathname, name, &stat_buf, leaf))
return 0;
diff --git a/find/ftsfind.c b/find/ftsfind.c
index b3a08f9..692d9f5 100644
--- a/find/ftsfind.c
+++ b/find/ftsfind.c
@@ -173,18 +173,6 @@ inside_dir (int dir_fd)
static void init_mounted_dev_list (void);
#endif
-/* We have encountered an error which should affect the exit status.
- * This is normally used to change the exit status from 0 to 1.
- * However, if the exit status is already 2 for example, we don't want to
- * reduce it to 1.
- */
-static void
-error_severity (int level)
-{
- if (state.exit_status < level)
- state.exit_status = level;
-}
-
#define STRINGIFY(X) #X
#define HANDLECASE(N) case N: return #N;
@@ -371,9 +359,6 @@ show_outstanding_execdirs (FILE *fp)
/* No debug output is wanted. */
}
}
-
-
-
static void
consider_visiting (FTS *p, FTSENT *ent)
@@ -410,15 +395,13 @@ consider_visiting (FTS *p, FTSENT *ent)
if (ent->fts_info == FTS_ERR
|| ent->fts_info == FTS_DNR)
{
- error (0, ent->fts_errno, "%s",
- safely_quote_err_filename (0, ent->fts_path));
- error_severity (1);
+ nonfatal_target_file_error (ent->fts_errno, ent->fts_path);
return;
}
else if (ent->fts_info == FTS_DC)
{
issue_loop_warning (ent);
- error_severity (1);
+ error_severity (EXIT_FAILURE);
return;
}
else if (ent->fts_info == FTS_SLNONE)
@@ -432,8 +415,7 @@ consider_visiting (FTS *p, FTSENT *ent)
*/
if (symlink_loop (ent->fts_accpath))
{
- error (0, ELOOP, "%s", safely_quote_err_filename (0, ent->fts_path));
- error_severity (1);
+ nonfatal_target_file_error (ELOOP, ent->fts_path);
return;
}
}
@@ -442,9 +424,7 @@ consider_visiting (FTS *p, FTSENT *ent)
if (ent->fts_level == 0)
{
/* e.g., nonexistent starting point */
- error (0, ent->fts_errno, "%s",
- safely_quote_err_filename (0, ent->fts_path));
- error_severity (1); /* remember problem */
+ nonfatal_target_file_error (ent->fts_errno, ent->fts_path);
return;
}
else
@@ -454,11 +434,24 @@ consider_visiting (FTS *p, FTSENT *ent)
*/
if (symlink_loop (ent->fts_accpath))
{
- error (0, ELOOP, "%s",
- safely_quote_err_filename (0, ent->fts_path));
- error_severity (1);
+ nonfatal_target_file_error (ELOOP, ent->fts_path);
return;
}
+ else
+ {
+ nonfatal_target_file_error (ent->fts_errno, ent->fts_path);
+ /* Continue despite the error, as file name without stat info
+ * might be better than not even processing the file name. This
+ * can lead to repeated error messages later on, though, if a
+ * predicate requires stat information.
+ *
+ * Not printing an error message here would be even more wrong,
+ * though, as this could cause the contents of a directory to be
+ * silently ignored, as the directory wouldn't be identified as
+ * such.
+ */
+ }
+
}
}
@@ -467,7 +460,7 @@ consider_visiting (FTS *p, FTSENT *ent)
|| ent->fts_info == FTS_NS /* e.g. symlink loop */)
{
assert (!state.have_stat);
- assert (ent->fts_info == FTS_NSOK || state.type != 0);
+ assert (ent->fts_info == FTS_NSOK || state.type == 0);
mode = state.type;
}
else
@@ -621,11 +614,13 @@ find (char *arg)
{
error (0, errno, _("cannot search %s"),
safely_quote_err_filename (0, arg));
+ error_severity (EXIT_FAILURE);
}
else
{
while ( (ent=fts_read (p)) != NULL )
{
+ state.already_issued_stat_error_msg = false;
state.have_stat = false;
state.have_type = !!ent->fts_statp->st_mode;
state.type = state.have_type ? ent->fts_statp->st_mode : 0;
@@ -640,6 +635,7 @@ find (char *arg)
error (0, errno,
_("failed to restore working directory after searching %s"),
arg);
+ error_severity (EXIT_FAILURE);
return false;
}
p = NULL;
@@ -689,6 +685,7 @@ main (int argc, char **argv)
else
set_program_name ("find");
+ state.already_issued_stat_error_msg = false;
state.exit_status = 0;
state.execdirs_outstanding = false;
state.cwd_dir_fd = AT_FDCWD;
diff --git a/find/parser.c b/find/parser.c
index 8238671..8668ce4 100644
--- a/find/parser.c
+++ b/find/parser.c
@@ -744,7 +744,7 @@ collect_arg_stat_info (char **argv, int *arg_ptr, struct stat *p,
}
else
{
- fatal_file_error (filename);
+ fatal_target_file_error (errno, filename);
}
}
else
@@ -1685,7 +1685,7 @@ parse_newerXY (const struct parser_table* entry, char **argv, int *arg_ptr)
/* Stat the named file. */
set_stat_placeholders (&stat_newer);
if ((*options.xstat) (argv[*arg_ptr], &stat_newer))
- fatal_file_error (argv[*arg_ptr]);
+ fatal_target_file_error (errno, argv[*arg_ptr]);
if (!get_stat_Ytime (&stat_newer, y, &our_pred->args.reftime.ts))
{
@@ -2425,7 +2425,7 @@ parse_samefile (const struct parser_table* entry, char **argv, int *arg_ptr)
*/
if (0 != fstat (fd, &fst))
{
- fatal_file_error (argv[*arg_ptr]);
+ fatal_target_file_error (errno, argv[*arg_ptr]);
}
else
{
@@ -2435,7 +2435,7 @@ parse_samefile (const struct parser_table* entry, char **argv, int *arg_ptr)
* destination of the link, not the link itself.
*/
if ((*options.xstat) (argv[*arg_ptr], &st))
- fatal_file_error (argv[*arg_ptr]);
+ fatal_target_file_error (errno, argv[*arg_ptr]);
if ((options.symlink_handling == SYMLINK_NEVER_DEREF)
&& (!options.open_nofollow_available))
@@ -3799,7 +3799,7 @@ open_output_file (const char *path, struct format_val *p)
if (p->stream == NULL)
{
- fatal_file_error (path);
+ fatal_nontarget_file_error (errno, path);
}
}
diff --git a/find/pred.c b/find/pred.c
index cb61ed2..44db6a6 100644
--- a/find/pred.c
+++ b/find/pred.c
@@ -696,7 +696,7 @@ checked_fprintf (struct format_val *dest, const char *fmt, ...)
va_start (ap, fmt);
rv = vfprintf (dest->stream, fmt, ap);
if (rv < 0)
- nonfatal_file_error (dest->filename);
+ nonfatal_nontarget_file_error (errno, dest->filename);
}
@@ -707,7 +707,7 @@ checked_print_quoted (struct format_val *dest,
int rv = print_quoted (dest->stream, dest->quote_opts, dest->dest_is_tty,
format, s);
if (rv < 0)
- nonfatal_file_error (dest->filename);
+ nonfatal_nontarget_file_error (errno, dest->filename);
}
@@ -716,7 +716,7 @@ checked_fwrite (void *p, size_t siz, size_t nmemb, struct format_val *dest)
{
int items_written = fwrite (p, siz, nmemb, dest->stream);
if (items_written < nmemb)
- nonfatal_file_error (dest->filename);
+ nonfatal_nontarget_file_error (errno, dest->filename);
}
static void
@@ -724,7 +724,7 @@ checked_fflush (struct format_val *dest)
{
if (0 != fflush (dest->stream))
{
- nonfatal_file_error (dest->filename);
+ nonfatal_nontarget_file_error (errno, dest->filename);
}
}
diff --git a/find/sharefile.c b/find/sharefile.c
index 8e0f4cc..1442d7b 100644
--- a/find/sharefile.c
+++ b/find/sharefile.c
@@ -76,7 +76,7 @@ entry_free (void *pv)
if (p->fp)
{
if (0 != fclose (p->fp))
- fatal_file_error (p->name);
+ fatal_nontarget_file_error (errno, p->name);
}
free (p->name);
free (p);
diff --git a/find/tree.c b/find/tree.c
index 08f2f0a..d07b125 100644
--- a/find/tree.c
+++ b/find/tree.c
@@ -1283,6 +1283,7 @@ build_expression_tree (int argc, char *argv[], int end_of_leading_options)
/* Build the input order list. */
while (i < argc )
{
+ state.already_issued_stat_error_msg = false;
if (!looks_like_expression (argv[i], false))
{
error (0, 0, _("paths must precede expression: %s"), argv[i]);
diff --git a/find/util.c b/find/util.c
index 3761a61..a789131 100644
--- a/find/util.c
+++ b/find/util.c
@@ -210,15 +210,14 @@ get_statinfo (const char *pathname, const char *name, struct stat *p)
/* Savannah bug #16378. */
error (0, 0, _("WARNING: file %s appears to have mode 0000"),
quotearg_n_style (0, options.err_quoting_style, name));
+ error_severity (1);
}
}
else
{
if (!options.ignore_readdir_race || (errno != ENOENT) )
{
- error (0, errno, "%s",
- safely_quote_err_filename (0, pathname));
- state.exit_status = 1;
+ nonfatal_target_file_error (errno, pathname);
}
return -1;
}
@@ -272,6 +271,10 @@ get_info (const char *pathname,
int result = get_statinfo (pathname, state.rel_pathname, p);
if (result != 0)
{
+ return -1; /* failure. */
+ }
+ else
+ {
/* Verify some postconditions. We can't check st_mode for
non-zero-ness because of Savannah bug #16378 (which is
that broken NFS servers can return st_mode==0). */
@@ -283,10 +286,6 @@ get_info (const char *pathname,
{
assert (p->st_ino);
}
- return -1; /* failure. */
- }
- else
- {
return 0; /* success. */
}
}
@@ -486,7 +485,7 @@ cleanup (void)
}
if (fflush (stdout) == EOF)
- nonfatal_file_error ("standard output");
+ nonfatal_nontarget_file_error (errno, "standard output");
}
/* Savannah bug #16378 manifests as an assertion failure in pred_type()
@@ -1074,35 +1073,83 @@ safely_quote_err_filename (int n, char const *arg)
return quotearg_n_style (n, options.err_quoting_style, arg);
}
+/* We have encountered an error which should affect the exit status.
+ * This is normally used to change the exit status from 0 to 1.
+ * However, if the exit status is already 2 for example, we don't want to
+ * reduce it to 1.
+ */
+void
+error_severity (int level)
+{
+ if (state.exit_status < level)
+ state.exit_status = level;
+}
+
/* report_file_err
*/
static void
-report_file_err(int exitval, int errno_value, const char *name)
+report_file_err(int exitval, int errno_value,
+ boolean is_target_file, const char *name)
{
/* It is important that the errno value is passed in as a function
* argument before we call safely_quote_err_filename(), because otherwise
* we might find that safely_quote_err_filename() changes errno.
*/
- if (state.exit_status < 1)
- state.exit_status = 1;
-
- error (exitval, errno_value, "%s", safely_quote_err_filename (0, name));
+ if (!is_target_file || !state.already_issued_stat_error_msg)
+ {
+ error (exitval, errno_value, "%s", safely_quote_err_filename (0, name));
+ error_severity (1);
+ }
+ if (is_target_file)
+ {
+ state.already_issued_stat_error_msg = true;
+ }
}
-/* fatal_file_error
+/* nonfatal_target_file_error
*
*/
void
-fatal_file_error(const char *name)
+nonfatal_target_file_error (int errno_value, const char *name)
{
- report_file_err (1, errno, name);
+ report_file_err (0, errno_value, true, name);
+}
+
+/* fatal_target_file_error
+ *
+ * Report an error on a target file (i.e. a file we are searching).
+ * Such errors are only reported once per searched file.
+ *
+ */
+void
+fatal_target_file_error(int errno_value, const char *name)
+{
+ report_file_err (1, errno_value, true, name);
/*NOTREACHED*/
abort ();
}
+/* nonfatal_nontarget_file_error
+ *
+ */
void
-nonfatal_file_error (const char *name)
+nonfatal_nontarget_file_error (int errno_value, const char *name)
{
- report_file_err (0, errno, name);
+ report_file_err (0, errno_value, false, name);
}
+/* fatal_nontarget_file_error
+ *
+ */
+void
+fatal_nontarget_file_error(int errno_value, const char *name)
+{
+ /* We're going to exit fatally, so make sure we always isssue the error
+ * message, even if it will be duplicate. Motivation: otherwise it may
+ * not be clear what went wrong.
+ */
+ state.already_issued_stat_error_msg = false;
+ report_file_err (1, errno_value, false, name);
+ /*NOTREACHED*/
+ abort ();
+}

98
findutils-4.5.7-fdleak.patch
View File

@ -1,98 +0,0 @@
upstream commit a44cece
ChangeLog | 12 ++++++++++++
NEWS | 5 +++++
lib/fdleak.c | 32 +++++++++++++++++++++++++++++++-
3 files changed, 48 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9a6d7d4..abe1993 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-04-04 James Youngman <jay@gnu.org>
+
+ Fix Savannah bug #29435: fd_is_cloexec does not work on Fedora
+ buildhosts.
+ Fix open_cloexec on hosts which ignore O_CLOEXEC (i.e. old kernels).
+ * lib/fdleak.c (o_cloexec_works): New function, detects whether
+ the open flag O_CLOEXEC has any effect.
+ (open_cloexec): Call o_cloexec_works, just once, to find out
+ whether O_CLOEXEC is effective. If not, set the close-on-exec
+ flag on fds by calling set_cloexec_flag.
+ * NEWS: Mention this bugfix.
+
2010-04-03 James Youngman <jay@gnu.org>
Prepare for release of findutils-4.5.7.
diff --git a/NEWS b/NEWS
index f2eef6f..e171b87 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,10 @@
GNU findutils NEWS - User visible changes. -*- outline -*- (allout)
+** Bug Fixes
+
+#29435: fd_is_cloexec does not work on Fedora buildhosts
+
+
* Major changes in release 4.5.7, 2010-04-03
** Performance changes
diff --git a/lib/fdleak.c b/lib/fdleak.c
index 2c362cf..47f9579 100644
--- a/lib/fdleak.c
+++ b/lib/fdleak.c
@@ -303,11 +303,30 @@ find_first_leaked_fd (const int* prev_non_cloexec_fds, size_t n)
return context.leaked_fd;
}
+/* Determine if O_CLOEXEC actually works (Savannah bug #29435:
+ fd_is_cloexec () does not work on Fedora buildhosts).
+ */
+static bool
+o_cloexec_works (void)
+{
+ bool result = false;
+ int fd = open ("/", O_RDONLY|O_CLOEXEC);
+ if (fd >= 0)
+ {
+ result = fd_is_cloexec (fd);
+ close (fd);
+ }
+ return result;
+}
+
+
int
open_cloexec (const char *path, int flags, ...)
{
int fd;
mode_t mode = 0;
+ static bool cloexec_works = false;
+ static bool cloexec_status_known = false;
if (flags & O_CREAT)
{
@@ -322,8 +341,19 @@ open_cloexec (const char *path, int flags, ...)
va_end (ap);
}
+ /* Kernels usually ignore open flags they don't recognise, so it
+ * is possible this program was built against a library which
+ * defines O_CLOEXEC, but is running on a kernel that (silently)
+ * does not recognise it. We figure this out by just trying it,
+ * once.
+ */
+ if (!cloexec_status_known)
+ {
+ cloexec_works = o_cloexec_works ();
+ cloexec_status_known = true;
+ }
fd = open (path, flags|O_CLOEXEC, mode);
- if ((fd >= 0) && !O_CLOEXEC)
+ if ((fd >= 0) && !(O_CLOEXEC && cloexec_works))
{
set_cloexec_flag (fd, true);
}

10
findutils-4.5.7-warnings.patch
View File

@ -3,10 +3,10 @@
2 files changed, 4 insertions(+), 3 deletions(-) 2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/find/pred.c b/find/pred.c diff --git a/find/pred.c b/find/pred.c
index 7df37b1..cb61ed2 100644 index e310eea..140dd5c 100644
--- a/find/pred.c --- a/find/pred.c
+++ b/find/pred.c +++ b/find/pred.c
@@ -2045,7 +2045,7 @@ launch (struct buildcmd_control *ctl, void *usercontext, int argc, char **argv) @@ -2111,7 +2111,7 @@ launch (struct buildcmd_control *ctl, void *usercontext, int argc, char **argv)
} }
} }
@ -16,10 +16,10 @@ index 7df37b1..cb61ed2 100644
else else
execvp (argv[0], argv); execvp (argv[0], argv);
diff --git a/xargs/xargs.c b/xargs/xargs.c diff --git a/xargs/xargs.c b/xargs/xargs.c
index 4954256..bf48af5 100644 index c53b5a9..a0d90a5 100644
--- a/xargs/xargs.c --- a/xargs/xargs.c
+++ b/xargs/xargs.c +++ b/xargs/xargs.c
@@ -1117,7 +1117,7 @@ xargs_do_exec (struct buildcmd_control *ctl, void *usercontext, int argc, char * @@ -1105,7 +1105,7 @@ xargs_do_exec (struct buildcmd_control *ctl, void *usercontext, int argc, char *
prep_child_for_exec (); prep_child_for_exec ();
@ -28,7 +28,7 @@ index 4954256..bf48af5 100644
errno = E2BIG; errno = E2BIG;
else else
execvp (argv[0], argv); execvp (argv[0], argv);
@@ -1135,7 +1135,8 @@ xargs_do_exec (struct buildcmd_control *ctl, void *usercontext, int argc, char * @@ -1123,7 +1123,8 @@ xargs_do_exec (struct buildcmd_control *ctl, void *usercontext, int argc, char *
* utility if we run it, for POSIX compliance on the * utility if we run it, for POSIX compliance on the
* handling of exit values. * handling of exit values.
*/ */

BIN
findutils-4.5.7.tar.gz.sig
View File

Binary file not shown.

BIN
findutils-4.5.9.tar.gz.sig Normal file
View File

Binary file not shown.

24
findutils.spec
View File

@ -1,7 +1,7 @@
Summary: The GNU versions of find utilities (find and xargs) Summary: The GNU versions of find utilities (find and xargs)
Name: findutils Name: findutils
Version: 4.5.7 Version: 4.5.9
Release: 4%{?dist} Release: 1%{?dist}
Epoch: 1 Epoch: 1
License: GPLv3+ License: GPLv3+
Group: Applications/File Group: Applications/File
@ -23,12 +23,6 @@ Patch3: findutils-4.4.2-xautofs.patch
# eliminate compile-time warnings # eliminate compile-time warnings
Patch4: findutils-4.5.7-warnings.patch Patch4: findutils-4.5.7-warnings.patch
# upstream commit a44cece
Patch5: findutils-4.5.7-fdleak.patch
# rhbz #579476 (upstream bug #27213)
Patch6: findutils-4.5.7-bz579476.patch
Requires(post): /sbin/install-info Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info Requires(preun): /sbin/install-info
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -55,8 +49,6 @@ useful for finding things on your system.
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1
%patch6 -p1
# needed because of findutils-4.4.0-no-locate.patch # needed because of findutils-4.4.0-no-locate.patch
aclocal -I gnulib/m4 -I m4 aclocal -I gnulib/m4 -I m4
@ -87,15 +79,14 @@ ln -sf ../../bin/find $RPM_BUILD_ROOT/usr/bin
%post %post
if [ -f %{_infodir}/find.info.gz ]; then if [ -f %{_infodir}/find.info.gz ]; then
/sbin/install-info %{_infodir}/find.info.gz %{_infodir}/dir || : /sbin/install-info %{_infodir}/find.info.gz %{_infodir}/dir || :
fi fi
%preun %preun
if [ $1 = 0 ]; then if [ $1 = 0 ]; then
if [ -f %{_infodir}/find.info.gz ]; then if [ -f %{_infodir}/find.info.gz ]; then
/sbin/install-info --delete %{_infodir}/find.info.gz %{_infodir}/dir \ /sbin/install-info --delete %{_infodir}/find.info.gz %{_infodir}/dir || :
|| : fi
fi
fi fi
%clean %clean
@ -114,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
%{_infodir}/find-maint.info.gz %{_infodir}/find-maint.info.gz
%changelog %changelog
* Wed May 05 2010 Kamil Dudka <kdudka@redhat.com> - 1:4.5.9-1
- new upstream release, dropped applied patches
* Tue Apr 06 2010 Kamil Dudka <kdudka@redhat.com> - 1:4.5.7-4 * Tue Apr 06 2010 Kamil Dudka <kdudka@redhat.com> - 1:4.5.7-4
- avoid assertion failure due to access permissions (#579476) - avoid assertion failure due to access permissions (#579476)

2
sources
View File

@ -1 +1 @@
abe3035556f2b95a83cd4a99d1614e37 findutils-4.5.7.tar.gz f0276639a824f57e78916d3c207ee618 findutils-4.5.9.tar.gz