rpms/findutils/devel findutils-4.4.2-xautofs.patch, 1.5, 1.6 findutils-4.5.7-warnings.patch, 1.2, 1.3

Kamil Dudka kdudka at fedoraproject.org
Mon May 10 16:48:39 UTC 2010


Author: kdudka

Update of /cvs/extras/rpms/findutils/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv23374

Modified Files:
	findutils-4.4.2-xautofs.patch findutils-4.5.7-warnings.patch 
Log Message:
update some patches

findutils-4.4.2-xautofs.patch:
 doc/find.texi  |    4 ++++
 find/defs.h    |    3 +++
 find/find.1    |    3 +++
 find/ftsfind.c |    6 ++++++
 find/parser.c  |   11 ++++++++++-
 find/util.c    |    1 +
 6 files changed, 27 insertions(+), 1 deletion(-)

Index: findutils-4.4.2-xautofs.patch
===================================================================
RCS file: /cvs/extras/rpms/findutils/devel/findutils-4.4.2-xautofs.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- findutils-4.4.2-xautofs.patch	5 May 2010 11:38:25 -0000	1.5
+++ findutils-4.4.2-xautofs.patch	10 May 2010 16:48:39 -0000	1.6
@@ -2,9 +2,9 @@
  find/defs.h    |    3 +++
  find/find.1    |    3 +++
  find/ftsfind.c |    6 ++++++
- find/parser.c  |    9 +++++++++
+ find/parser.c  |   11 ++++++++++-
  find/util.c    |    1 +
- 6 files changed, 26 insertions(+), 0 deletions(-)
+ 6 files changed, 27 insertions(+), 1 deletions(-)
 
 diff --git a/doc/find.texi b/doc/find.texi
 index b509f66..3ce5b1e 100644
@@ -22,7 +22,7 @@ index b509f66..3ce5b1e 100644
  @deffnx Option -mount
  Don't descend directories on other filesystems.  These options are
 diff --git a/find/defs.h b/find/defs.h
-index 11d1d00..da3ff96 100644
+index 11d1d00..f95ce72 100644
 --- a/find/defs.h
 +++ b/find/defs.h
 @@ -561,6 +561,9 @@ struct options
@@ -67,7 +67,7 @@ index 9fdb8ef..bd7cc37 100644
      {
        /* this is the preorder visit, but user said -depth */
 diff --git a/find/parser.c b/find/parser.c
-index 3da5721..e99caff 100644
+index 3da5721..b14b59a 100644
 --- a/find/parser.c
 +++ b/find/parser.c
 @@ -151,6 +151,7 @@ static bool parse_user          (const struct parser_table*, char *argv[], int *
@@ -86,6 +86,15 @@ index 3da5721..e99caff 100644
    PARSE_TEST       ("xtype",                 xtype),	     /* GNU */
  #ifdef UNIMPLEMENTED_UNIX
    /* It's pretty ugly for find to know about archive formats.
+@@ -1235,7 +1237,7 @@ operators (decreasing precedence; -and is implicit where no others are given):\n
+ positional options (always true): -daystart -follow -regextype\n\n\
+ normal options (always true, specified before other expressions):\n\
+       -depth --help -maxdepth LEVELS -mindepth LEVELS -mount -noleaf\n\
+-      --version -xdev -ignore_readdir_race -noignore_readdir_race\n"));
++      --version -xautofs -xdev -ignore_readdir_race -noignore_readdir_race\n"));
+   puts (_("\
+ tests (N can be +N or -N or N): -amin N -anewer FILE -atime N -cmin N\n\
+       -cnewer FILE -ctime N -empty -false -fstype TYPE -gid N -group NAME\n\
 @@ -2795,6 +2797,13 @@ parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr)
  }
  

findutils-4.5.7-warnings.patch:
 find/pred.c   |    6 +++---
 xargs/xargs.c |    5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

Index: findutils-4.5.7-warnings.patch
===================================================================
RCS file: /cvs/extras/rpms/findutils/devel/findutils-4.5.7-warnings.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- findutils-4.5.7-warnings.patch	5 May 2010 11:38:25 -0000	1.2
+++ findutils-4.5.7-warnings.patch	10 May 2010 16:48:39 -0000	1.3
@@ -1,11 +1,29 @@
- find/pred.c   |    2 +-
+ find/pred.c   |    6 +++---
  xargs/xargs.c |    5 +++--
- 2 files changed, 4 insertions(+), 3 deletions(-)
+ 2 files changed, 6 insertions(+), 5 deletions(-)
 
 diff --git a/find/pred.c b/find/pred.c
-index e310eea..140dd5c 100644
+index e310eea..6eeaa42 100644
 --- a/find/pred.c
 +++ b/find/pred.c
+@@ -566,7 +566,7 @@ impl_pred_exec (const char *pathname,
+ 		struct predicate *pred_ptr)
+ {
+   struct exec_val *execp = &pred_ptr->args.exec_vec;
+-  char *target;
++  const char *target;
+   bool result;
+   const bool local = is_exec_in_local_dir (pred_ptr->pred_func);
+   char *prefix;
+@@ -665,7 +665,7 @@ impl_pred_exec (const char *pathname,
+   if (target != pathname)
+     {
+       assert (local);
+-      free (target);
++      free ((char *) target);
+     }
+   return result;
+ }
 @@ -2111,7 +2111,7 @@ launch (struct buildcmd_control *ctl, void *usercontext, int argc, char **argv)
  	    }
  	}



More information about the scm-commits mailing list