Fwd: [patch] chmod -[cv]: be verbose about the old mode

[Bernhard Voelker]

Hi GNU,

what about having `chmod -[cv]` also print the old mode?


$ src/chmod -c 750 /tmp/x
mode of `/tmp/x' changed from 0755 (rwxr-xr-x) to 0750 (rwxr-x---)

$ src/chmod -c 750 /tmp/x

$ src/chmod -v 750 /tmp/x
mode of `/tmp/x' retained as 0750 (rwxr-x---)

$ src/chmod -v 755 /tmp/x
mode of `/tmp/x' changed from 0750 (rwxr-x---) to 0755 (rwxr-xr-x)

$ src/chmod -v 755 /tmp    # I'm not root obviously
src/chmod: changing permissions of `/tmp': Operation not permitted
failed to change mode of `/tmp' from 1777 (rwxrwxrwt) to 0755 (rwxr-xr-x)

$ src/chmod -v 755 /x
src/chmod: cannot access `/x': No such file or directory
failed to change mode of `/x' from 0000 (---------) to 0000 (---------)

$ src/chmod -c 755 /x
src/chmod: cannot access `/x': No such file or directory

Have a nice day,
Berny


--- src-8.12/chmod.c	2011-05-25 09:53:44.000000000 +0200
+++ src/chmod.c	2011-05-25 09:55:31.000000000 +0200
@@ -137,10 +137,11 @@
    CHANGED describes what (if anything) has happened. */
 
 static void
-describe_change (const char *file, mode_t mode,
+describe_change (const char *file, mode_t old_mode, mode_t mode,
                  enum Change_status changed)
 {
   char perms[12];		/* "-rwxrwxrwx" ls-style modes. */
+  char old_perms[12];
   const char *fmt;
 
   if (changed == CH_NOT_APPLIED)
@@ -152,21 +153,28 @@
 
   strmode (mode, perms);
   perms[10] = '\0';		/* Remove trailing space.  */
+
+  strmode (old_mode, old_perms);
+  old_perms[10] = '\0';		/* Remove trailing space.  */
+
   switch (changed)
     {
     case CH_SUCCEEDED:
-      fmt = _("mode of %s changed to %04lo (%s)\n");
+      fmt = _("mode of %s changed from %04lo (%s) to %04lo (%s)\n");
       break;
     case CH_FAILED:
-      fmt = _("failed to change mode of %s to %04lo (%s)\n");
+      fmt = _("failed to change mode of %s from %04lo (%s) to %04lo (%s)\n");
       break;
     case CH_NO_CHANGE_REQUESTED:
       fmt = _("mode of %s retained as %04lo (%s)\n");
-      break;
+      printf (fmt, quote (file),
+             (unsigned long int) (mode & CHMOD_MODE_BITS), &perms[1]);
+      return;
     default:
       abort ();
     }
   printf (fmt, quote (file),
+          (unsigned long int) (old_mode & CHMOD_MODE_BITS), &old_perms[1],
           (unsigned long int) (mode & CHMOD_MODE_BITS), &perms[1]);
 }
 
@@ -284,7 +292,7 @@
              : !chmod_succeeded ? CH_NOT_APPLIED
              : !changed ? CH_NO_CHANGE_REQUESTED
              : CH_SUCCEEDED);
-          describe_change (file_full_name, new_mode, ch_status);
+          describe_change (file_full_name, old_mode, new_mode, ch_status);
         }
     }