Mercurial > hg > toybox

comparison toys/pending/groupdel.c @ 1505:3fa0b2931082 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanup pass on groupdel.
author Rob Landley <rob@landley.net>
date Sat, 27 Sep 2014 21:04:47 -0500
parents ed28d4d9558d
children 5fac2769a159
comparison
equal deleted inserted replaced
1504:c86e27992c4a 1505:3fa0b2931082
10 10
11 config GROUPDEL 11 config GROUPDEL
12 bool "groupdel" 12 bool "groupdel"
13 default n 13 default n
14 help 14 help
15 usage: delgroup [USER] GROUP 15 usage: groupdel [USER] GROUP
16 usage: groupdel GROUP
17 16
18 Delete a group or remove a user from a group 17 Delete a group or remove a user from a group
19 */ 18 */
20 19
21 #define FOR_groupdel 20 #define FOR_groupdel
22 #include "toys.h" 21 #include "toys.h"
23 22
24 char *comma_find(char *name, char *list)
25 {
26 int len = strlen(name);
27
28 while (*list) {
29 while (*list == ',') list++;
30 if (!strncmp(name, list, len) && (!list[len] || list[len]==','))
31 return list;
32 while (*list && *list!=',') list++;
33 }
34
35 return 0;
36 }
37
38 void groupdel_main(void) 23 void groupdel_main(void)
39 { 24 {
40 struct group *grp = getgrnam(toys.optargs[toys.optc-1]); 25 struct group *grp = xgetgrnam(toys.optargs[toys.optc-1]);
41 char *entry = 0; 26 char *entry = 0;
42
43 if (!grp) perror_exit("group '%s'", toys.optargs[toys.optc-1]);
44 27
45 // delete user from group 28 // delete user from group
46 if (toys.optc == 2) { 29 if (toys.optc == 2) {
47 int i, len = 0, found = -1; 30 int i, len = 0, found = 0;
48 char *s; 31 char *s;
49 32
50 xgetpwnam(*toys.optargs); 33 xgetpwnam(*toys.optargs);
51 if (grp->gr_mem) { 34 if (grp->gr_mem) for (i = 0; grp->gr_mem[i]; i++) {
52 for (i = 0; grp->gr_mem[i]; i++) { 35 if (!found && !strcmp(*toys.optargs, grp->gr_mem[i])) found++;
53 if (found == -1 && !strcmp(*toys.optargs, grp->gr_mem[i])) found = i; 36 else len += strlen(grp->gr_mem[i]) + 1;
54 else len += strlen(grp->gr_mem[i]) + 1;
55 }
56 } 37 }
57 if (found == -1) 38 if (!found)
58 error_exit("user '%s' not in group '%s'", *toys.optargs, toys.optargs[1]); 39 error_exit("user '%s' not in group '%s'", *toys.optargs, toys.optargs[1]);
59 40
60 entry = s = xmalloc(len); 41 entry = s = xmalloc(len);
61 for (i = 0; grp->gr_mem[i]; ) { 42 for (i = 0; grp->gr_mem[i]; ) {
62 if (i) *(s++) = ','; 43 if (i) *(s++) = ',';
65 46
66 // delete group 47 // delete group
67 } else { 48 } else {
68 struct passwd *pw; 49 struct passwd *pw;
69 50
70 endpwent(); // possibly this should be in toy_init()? 51 for (endpwent(); (pw = getpwent());)
71 for (;;) {
72 if (!(pw = getpwent())) break;
73 if (pw->pw_gid == grp->gr_gid) break; 52 if (pw->pw_gid == grp->gr_gid) break;
74 } 53
75 if (pw) error_exit("can't remove primary group of user '%s'", pw->pw_name); 54 if (pw) error_exit("can't remove primary group of user '%s'", pw->pw_name);
76 endpwent(); 55 if (CFG_TOYBOX_FREE) endpwent();
77 } 56 }
78 57
79 update_password("/etc/group", grp->gr_name, entry); 58 update_password("/etc/group", grp->gr_name, entry);
80 update_password("/etc/gshadow", grp->gr_name, entry); 59 update_password("/etc/gshadow", grp->gr_name, entry);
81 if (CFG_TOYBOX_FREE) free(entry); 60 if (CFG_TOYBOX_FREE) free(entry);