* getfacl.c (username): New function.

(groupname): Ditto.
	(usage): Ditto.  Add more user friendly help text.
	(main): Add -n and --help option.  Print names instead of IDs
	unless -n option is given.
	* setfacl.c (getperm): Tolerate whitespace and comment chars in input.
	(getaclentry): Fix several input string misdetections.
	(getaclentries): Allow - as input file name to read from stdin.
	Tolerate whitespace and comment chars in input.
	(usage): Add more user friendly help text.
	(main): Add --help option.
This commit is contained in:
Corinna Vinschen
2001-11-04 17:24:24 +00:00
parent 86fbc3d90b
commit 56c29a3c87
3 changed files with 255 additions and 51 deletions

View File

@@ -31,31 +31,93 @@ permstr (mode_t perm)
return pbuf;
}
#if 0
char *
const char *
username (uid_t uid)
{
static char ubuf[256];
struct passwd *pw;
if (pw = getpwuid (uid))
if ((pw = getpwuid (uid)))
strcpy (ubuf, pw->pw_name);
else
strcpy (ubuf, "<unknown>");
sprintf (ubuf, "%d <unknown>", uid);
return ubuf;
}
char *
const char *
groupname (gid_t gid)
{
static char gbuf[256];
struct group *gr;
if (gr = getgruid (gid))
if ((gr = getgrgid (gid)))
strcpy (gbuf, gr->gr_name);
else
strcpy (gbuf, "<unknown>");
sprintf (gbuf, "%d <unknown>", gid);
return gbuf;
}
#endif
#define pn(txt) fprintf (fp, txt "\n", name)
#define p(txt) fprintf (fp, txt "\n")
int
usage (const char *name, int help)
{
FILE *fp = help ? stdout : stderr;
pn ("usage: %s [-adn] file...");
if (!help)
pn ("Try `%s --help' for more information.");
else
{
p ("");
p ("Display file and directory access control lists (ACLs).");
p ("");
p ("For each argument that is a regular file, special file or");
p ("directory, getfacl displays the owner, the group, and the ACL.");
p ("For directories getfacl displays additionally the default ACL.");
p ("");
p ("With no options specified, getfacl displays the filename, the");
p ("owner, the group, and both the ACL and the default ACL, if it");
p ("exists.");
p ("");
p ("The following options are supported:");
p ("");
p ("-a Display the filename, the owner, the group, and the ACL");
p (" of the file.");
p ("");
p ("-d Display the filename, the owner, the group, and the default");
p (" ACL of the directory, if it exists.");
p ("");
p ("-n Display user and group IDs instead of names.");
p ("");
p ("The format for ACL output is as follows:");
p (" # file: filename");
p (" # owner: name or uid");
p (" # group: name or uid");
p (" user::perm");
p (" user:name or uid:perm");
p (" group::perm");
p (" group:name or gid:perm");
p (" mask:perm");
p (" other:perm");
p (" default:user::perm");
p (" default:user:name or uid:perm");
p (" default:group::perm");
p (" default:group:name or gid:perm");
p (" default:mask:perm");
p (" default:other:perm");
p ("");
p ("When multiple files are specified on the command line, a blank");
p ("line separates the ACLs for each file.");
}
return 1;
}
struct option longopts[] = {
{"help", no_argument, NULL, 'h'},
{0, no_argument, NULL, 0}
};
int
main (int argc, char **argv)
@@ -64,11 +126,12 @@ main (int argc, char **argv)
int c, i;
int aopt = 0;
int dopt = 0;
int nopt = 0;
int first = 1;
struct stat st;
aclent_t acls[MAX_ACL_ENTRIES];
while ((c = getopt (argc, argv, "ad")) != EOF)
while ((c = getopt_long (argc, argv, "adn", longopts, NULL)) != EOF)
switch (c)
{
case 'a':
@@ -77,10 +140,16 @@ main (int argc, char **argv)
case 'd':
dopt = 1;
break;
case 'n':
nopt = 1;
break;
case 'h':
return usage (argv[0], 1);
default:
fprintf (stderr, "usage: %s [-ad] file...\n", argv[0]);
return 1;
return usage (argv[0], 0);
}
if (optind > argc - 1)
return usage (argv[0], 0);
while ((c = optind++) < argc)
{
if (stat (argv[c], &st))
@@ -92,8 +161,16 @@ main (int argc, char **argv)
putchar ('\n');
first = 0;
printf ("# file: %s\n", argv[c]);
printf ("# owner: %d\n", st.st_uid);
printf ("# group: %d\n", st.st_gid);
if (nopt)
{
printf ("# owner: %d\n", st.st_uid);
printf ("# group: %d\n", st.st_gid);
}
else
{
printf ("# owner: %s\n", username (st.st_uid));
printf ("# group: %s\n", groupname (st.st_gid));
}
if ((c = acl (argv[c], GETACL, MAX_ACL_ENTRIES, acls)) < 0)
{
perror (argv[0]);
@@ -115,13 +192,19 @@ main (int argc, char **argv)
printf ("user::");
break;
case USER:
printf ("user:%d:", acls[i].a_id);
if (nopt)
printf ("user:%d:", acls[i].a_id);
else
printf ("user:%s:", username (acls[i].a_id));
break;
case GROUP_OBJ:
printf ("group::");
break;
case GROUP:
printf ("group:%d:", acls[i].a_id);
if (nopt)
printf ("group:%d:", acls[i].a_id);
else
printf ("group:%s:", groupname (acls[i].a_id));
break;
case CLASS_OBJ:
printf ("mask::");