JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* getfacl.c (print_version): Fix copyright.

Browse Source 
(main): Don't reuse local variables confusingly.  Don't print any file
	information if acl() fails.  Improve error message.  Always print a
	trailing empty line.  Set return code to 2 if accessing some file fails.
This commit is contained in:
Corinna Vinschen 2009-11-11 10:12:35 +00:00
parent 03c48ee2e0
commit afb7f5666d
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/utils/ChangeLog
View File

@ -1,3 +1,10 @@
2009-11-11 Corinna Vinschen <corinna@vinschen.de>
* getfacl.c (print_version): Fix copyright.
(main): Don't reuse local variables confusingly. Don't print any file
information if acl() fails. Improve error message. Always print a
trailing empty line. Set return code to 2 if accessing some file fails.
2009-11-04 Corinna Vinschen <corinna@vinschen.de> 2009-11-04 Corinna Vinschen <corinna@vinschen.de>
* path.cc (read_mounts): Skip unnecessary test if path has been * path.cc (read_mounts): Skip unnecessary test if path has been

34
winsup/utils/getfacl.c
View File

@ -1,6 +1,6 @@
/* getfacl.c /* getfacl.c
Copyright 2000, 2001, 2002 Red Hat Inc. Copyright 2000, 2001, 2002, 2003, 2004, 2009 Red Hat Inc.
Written by Corinna Vinschen <vinschen@redhat.com> Written by Corinna Vinschen <vinschen@redhat.com>
@ -19,6 +19,7 @@ details. */
#include <sys/acl.h> #include <sys/acl.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <string.h> #include <string.h>
#include <errno.h>
static const char version[] = "$Revision$"; static const char version[] = "$Revision$";
static char *prog_name; static char *prog_name;
@ -135,7 +136,7 @@ print_version ()
printf ("\ printf ("\
getfacl (cygwin) %.*s\n\ getfacl (cygwin) %.*s\n\
ACL Utility\n\ ACL Utility\n\
Copyright (c) 2000, 2001, 2002 Red Hat, Inc.\n\ Copyright (c) 2000, 2001, 2002, 2003, 2004, 2009 Red Hat, Inc.\n\
Compiled on %s\n\ Compiled on %s\n\
", len, v, __DATE__); ", len, v, __DATE__);
} }
@ -143,11 +144,11 @@ Compiled on %s\n\
int int
main (int argc, char **argv) main (int argc, char **argv)
{ {
int c, i; int c;
int ret = 0;
int aopt = 0; int aopt = 0;
int dopt = 0; int dopt = 0;
int nopt = 0; int nopt = 0;
int first = 1;
struct stat st; struct stat st;
aclent_t acls[MAX_ACL_ENTRIES]; aclent_t acls[MAX_ACL_ENTRIES];
@ -186,17 +187,18 @@ main (int argc, char **argv)
usage (stderr); usage (stderr);
return 1; return 1;
} }
while ((c = optind++) < argc) for (; optind < argc; ++optind)
{ {
if (stat (argv[c], &st)) int i, num_acls;
if (stat (argv[optind], &st)
|| (num_acls = acl (argv[optind], GETACL, MAX_ACL_ENTRIES, acls)) < 0)
{ {
perror (argv[0]); fprintf (stderr, "%s: %s: %s\n",
prog_name, argv[optind], strerror (errno));
ret = 2;
continue; continue;
} }
if (!first) printf ("# file: %s\n", argv[optind]);
putchar ('\n');
first = 0;
printf ("# file: %s\n", argv[c]);
if (nopt) if (nopt)
{ {
printf ("# owner: %lu\n", (unsigned long)st.st_uid); printf ("# owner: %lu\n", (unsigned long)st.st_uid);
@ -207,12 +209,7 @@ main (int argc, char **argv)
printf ("# owner: %s\n", username (st.st_uid)); printf ("# owner: %s\n", username (st.st_uid));
printf ("# group: %s\n", groupname (st.st_gid)); printf ("# group: %s\n", groupname (st.st_gid));
} }
if ((c = acl (argv[c], GETACL, MAX_ACL_ENTRIES, acls)) < 0) for (i = 0; i < num_acls; ++i)
{
perror (argv[0]);
continue;
}
for (i = 0; i < c; ++i)
{ {
if (acls[i].a_type & ACL_DEFAULT) if (acls[i].a_type & ACL_DEFAULT)
{ {
@ -251,6 +248,7 @@ main (int argc, char **argv)
} }
printf ("%s\n", permstr (acls[i].a_perm)); printf ("%s\n", permstr (acls[i].a_perm));
} }
putchar ('\n');
} }
return 0; return ret;
} }