acl/patches/acl-2.2.47-params.patch

   1 --- acl-2.2.47_old/getfacl/getfacl.c    2008-02-07 04:39:57.000000000 +0100
   2 +++ acl-2.2.47/getfacl/getfacl.c        2008-07-31 12:23:10.000000000 +0200
   3 @@ -43,7 +43,7 @@
   4  #define POSIXLY_CORRECT_STR "POSIXLY_CORRECT"
   5
   6  #if !POSIXLY_CORRECT
   7 -#  define CMD_LINE_OPTIONS "dRLP"
   8 +#  define CMD_LINE_OPTIONS "aceEsRLPtpndvh"
   9  #endif
  10  #define POSIXLY_CMD_LINE_OPTIONS "d"
  11
  12 @@ -555,23 +555,23 @@ void help(void)
  13  #if !POSIXLY_CORRECT
  14         } else {
  15                 printf(_(
  16 -"      --access            display the file access control list only\n"
  17 +"  -a,  --access           display the file access control list only\n"
  18  "  -d, --default           display the default access control list only\n"
  19 -"      --omit-header       do not display the comment header\n"
  20 -"      --all-effective     print all effective rights\n"
  21 -"      --no-effective      print no effective rights\n"
  22 -"      --skip-base         skip files that only have the base entries\n"
  23 +"  -c, --omit-header       do not display the comment header\n"
  24 +"  -e, --all-effective     print all effective rights\n"
  25 +"  -E, --no-effective      print no effective rights\n"
  26 +"  -s, --skip-base         skip files that only have the base entries\n"
  27  "  -R, --recursive         recurse into subdirectories\n"
  28  "  -L, --logical           logical walk, follow symbolic links\n"
  29  "  -P, --physical          physical walk, do not follow symbolic links\n"
  30 -"      --tabular           use tabular output format\n"
  31 -"      --numeric           print numeric user/group identifiers\n"
  32 -"      --absolute-names    don't strip leading '/' in pathnames\n"));
  33 +"  -t, --tabular           use tabular output format\n"
  34 +"  -n, --numeric           print numeric user/group identifiers\n"
  35 +"  -p, --absolute-names    don't strip leading '/' in pathnames\n"));
  36         }
  37  #endif
  38         printf(_(
  39 -"      --version           print version and exit\n"
  40 -"      --help              this help text\n"));
  41 +"  -v, --version           print version and exit\n"
  42 +"  -h, --help              this help text\n"));
  43  }
  44
  45  int main(int argc, char *argv[])
  46 --- acl-2.2.47_old/man/man1/getfacl.1   2008-02-07 04:39:57.000000000 +0100
  47 +++ acl-2.2.47/man/man1/getfacl.1       2008-07-31 11:23:45.000000000 +0200
  48 @@ -12,10 +12,10 @@ getfacl \- get file access control lists
  49  .SH SYNOPSIS
  50
  51  .B getfacl
  52 -[\-dRLPvh] file ...
  53 +[\-aceEsRLPrpndvh] file ...
  54
  55  .B getfacl
  56 -[\-dRLPvh] \-
  57 +[\-aceEsRLPrpndvh] \-
  58
  59  .SH DESCRIPTION
  60  For each file, getfacl displays the file name, owner, the group,
  61 @@ -78,22 +78,22 @@ accessing the file mode.
  62
  63  .SS OPTIONS
  64  .TP 4
  65 -.I \-\-access
  66 +.I \-a, \-\-access
  67  Display the file access control list.
  68  .TP
  69  .I \-d, \-\-default
  70  Display the default access control list.
  71  .TP
  72 -.I \-\-omit-header
  73 +.I \-c, \-\-omit-header
  74  Do not display the comment header (the first three lines of each file's output).
  75  .TP
  76 -.I \-\-all-effective
  77 +.I \-e, \-\-all-effective
  78  Print all effective rights comments, even if identical to the rights defined by the ACL entry.
  79  .TP
  80 -.I \-\-no-effective
  81 +.I \-E, \-\-no-effective
  82  Do not print effective rights comments.
  83  .TP
  84 -.I \-\-skip-base
  85 +.I \-s, \-\-skip-base
  86  Skip files that only have the base ACL entries (owner, group, others).
  87  .TP
  88  .I \-R, \-\-recursive
  89 @@ -109,17 +109,20 @@ Physical walk, do not follow symbolic li
  90  link arguments.
  91  Only effective in combination with \-R.
  92  .TP
  93 -.I \-\-tabular
  94 +.I \-t, \-\-tabular
  95  Use an alternative tabular output format. The ACL and the default ACL are displayed side by side. Permissions that are ineffective due to the ACL mask entry are displayed capitalized. The entry tag names for the ACL_USER_OBJ and ACL_GROUP_OBJ entries are also displayed in capital letters, which helps in spotting those entries.
  96  .TP
  97 -.I \-\-absolute-names
  98 +.I \-p, \-\-absolute-names
  99  Do not strip leading slash characters (`/'). The default behavior is to
 100  strip leading slash characters.
 101  .TP
 102 -.I \-\-version
 103 +.I \-n, \-\-numeric
 104 +List numeric user and group IDs
 105 +.TP
 106 +.I \-v, \-\-version
 107  Print the version of getfacl and exit.
 108  .TP
 109 -.I \-\-help
 110 +.I \-h, \-\-help
 111  Print help explaining the command line options.
 112  .TP
 113  .I \-\-
 114 --- acl-2.2.47_old/man/man1/setfacl.1   2008-02-07 04:39:57.000000000 +0100
 115 +++ acl-2.2.47/man/man1/setfacl.1       2008-07-31 13:53:29.000000000 +0200
 116 @@ -115,10 +115,10 @@ This also skips symbolic link arguments.
 117  Only effective in combination with \-R.
 118  This option cannot be mixed with `\-\-restore'.
 119  .TP 4
 120 -.I \-\-version
 121 +.I \-v, \-\-version
 122  Print the version of setfacl and exit.
 123  .TP 4
 124 -.I \-\-help
 125 +.I \-h, \-\-help
 126  Print help explaining the command line options.
 127  .TP 4
 128  .I \-\-
 129 --- acl-2.2.47_old/setfacl/setfacl.c    2008-07-31 11:23:18.000000000 +0200
 130 +++ acl-2.2.47/setfacl/setfacl.c        2008-07-31 12:23:13.000000000 +0200
 131 @@ -42,10 +42,10 @@ extern int do_set(const char *path_p, co
 132
 133  /* '-' stands for `process non-option arguments in loop' */
 134  #if !POSIXLY_CORRECT
 135 -#  define CMD_LINE_OPTIONS "-:bkndm:M:x:X:RLP"
 136 +#  define CMD_LINE_OPTIONS "-:bkndvhm:M:x:X:RLP"
 137  #  define CMD_LINE_SPEC "[-bkndRLP] { -m|-M|-x|-X ... } file ..."
 138  #endif
 139 -#define POSIXLY_CMD_LINE_OPTIONS "-:bkndm:M:x:X:"
 140 +#define POSIXLY_CMD_LINE_OPTIONS "-:bkndvhm:M:x:X:"
 141  #define POSIXLY_CMD_LINE_SPEC "[-bknd] {-m|-M|-x|-X ... } file ..."
 142
 143  struct option long_options[] = {
 144 @@ -265,8 +265,8 @@ void help(void)
 145         }
 146  #endif
 147         printf(_(
 148 -"      --version           print version and exit\n"
 149 -"      --help              this help text\n"));
 150 +"  -v, --version           print version and exit\n"
 151 +"  -h, --help              this help text\n"));
 152  }
 153
 154