Updated callers of the gnnulib filemode module so that they work with the 2006-07-09 version of gnulibcompat_gnulib_2006-07-09

3 files changed, 6 insertions, 8 deletions

diff --git a/find/pred.c b/find/pred.c
index 2c146abb..fc0c9fc6 100644
--- a/find/pred.c
+++ b/find/pred.c
@@ -724,17 +724,17 @@ pred_fprintf (char *pathname, struct stat *stat_buf, struct predicate *pred_ptr)
 	  }
 #endif				/* S_ISLNK */
 	  break;
-	  
+
 	case 'M':		/* mode as 10 chars (eg., "-rwxr-x--x" */
 	  /* UNTRUSTED, probably unexploitable */
 	  {
 	    char modestring[16] ;
-	    mode_string (stat_buf->st_mode, modestring);
+	    filemodestring (stat_buf, modestring);
 	    modestring[10] = '\0';
 	    fprintf (fp, segment->text, modestring);
 	  }
 	  break;
-	  
+
 	case 'm':		/* mode as octal number (perms only) */
 	  /* UNTRUSTED, probably unexploitable */
 	  {
@@ -1844,5 +1844,3 @@ pred_sanity_check(const struct predicate *predicates)
 	}
     }
 }
-
-
diff --git a/import-gnulib.sh b/import-gnulib.sh
index a295f58e..50cfaa63 100755
--- a/import-gnulib.sh
+++ b/import-gnulib.sh
@@ -44,7 +44,7 @@ alloca  argmatch  dirname error fileblocks  fnmatch-gnu fts \
 getline getopt human idcache lstat malloc memcmp memset mktime	\
 modechange pathmax quotearg realloc regex rpmatch savedir stdio-safer \
 stpcpy strdup strftime  strstr strtol strtoul strtoull strtoumax  \
-xalloc xalloc-die xgetcwd  xstrtol  xstrtoumax yesno human filemode \
+xalloc xalloc-die xgetcwd  xstrtod xstrtol  xstrtoumax yesno human filemode \
 getline stpcpy canonicalize mountlist closeout gettext stat-macros"
 
 # We need regex to ensure that we can build on platforms like 
diff --git a/lib/listfile.c b/lib/listfile.c
index cb200bf8..095769c9 100644
--- a/lib/listfile.c
+++ b/lib/listfile.c
@@ -209,9 +209,9 @@ list_file (char *name,
 
 #if HAVE_ST_DM_MODE
   /* Cray DMF: look at the file's migrated, not real, status */
-  mode_string (statp->st_dm_mode, modebuf);
+  strmode (statp->st_dm_mode, modebuf);
 #else
-  mode_string (statp->st_mode, modebuf);
+  strmode (statp->st_mode, modebuf);
 #endif
   modebuf[10] = '\0';