aboutsummaryrefslogtreecommitdiff
path: root/chmod_chown_chgrp.c
diff options
context:
space:
mode:
Diffstat (limited to 'chmod_chown_chgrp.c')
-rw-r--r--chmod_chown_chgrp.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/chmod_chown_chgrp.c b/chmod_chown_chgrp.c
index d3e267827..a5d9af491 100644
--- a/chmod_chown_chgrp.c
+++ b/chmod_chown_chgrp.c
@@ -36,7 +36,6 @@
36static unsigned long uid = -1; 36static unsigned long uid = -1;
37static unsigned long gid = -1; 37static unsigned long gid = -1;
38static int whichApp; 38static int whichApp;
39static char *invocationName = NULL;
40static char *theMode = NULL; 39static char *theMode = NULL;
41 40
42 41
@@ -88,7 +87,7 @@ static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
88 case CHMOD_APP: 87 case CHMOD_APP:
89 /* Parse the specified modes */ 88 /* Parse the specified modes */
90 if (parse_mode(theMode, &(statbuf->st_mode)) == FALSE) { 89 if (parse_mode(theMode, &(statbuf->st_mode)) == FALSE) {
91 fatalError( "%s: unknown mode: %s\n", invocationName, theMode); 90 fatalError( "%s: unknown mode: %s\n", applet_name, theMode);
92 } 91 }
93 if (chmod(fileName, statbuf->st_mode) == 0) 92 if (chmod(fileName, statbuf->st_mode) == 0)
94 return (TRUE); 93 return (TRUE);
@@ -105,8 +104,8 @@ int chmod_chown_chgrp_main(int argc, char **argv)
105 char *p=NULL; 104 char *p=NULL;
106 const char *appUsage; 105 const char *appUsage;
107 106
108 whichApp = (strcmp(*argv, "chown") == 0)? 107 whichApp = (strcmp(applet_name, "chown") == 0)?
109 CHOWN_APP : (strcmp(*argv, "chmod") == 0)? 108 CHOWN_APP : (strcmp(applet_name, "chmod") == 0)?
110 CHMOD_APP : CHGRP_APP; 109 CHMOD_APP : CHGRP_APP;
111 110
112 appUsage = (whichApp == CHOWN_APP)? 111 appUsage = (whichApp == CHOWN_APP)?
@@ -114,7 +113,6 @@ int chmod_chown_chgrp_main(int argc, char **argv)
114 113
115 if (argc < 2) 114 if (argc < 2)
116 usage(appUsage); 115 usage(appUsage);
117 invocationName = *argv;
118 argv++; 116 argv++;
119 117
120 /* Parse options */ 118 /* Parse options */
@@ -125,7 +123,7 @@ int chmod_chown_chgrp_main(int argc, char **argv)
125 recursiveFlag = TRUE; 123 recursiveFlag = TRUE;
126 break; 124 break;
127 default: 125 default:
128 fprintf(stderr, invalid_option, invocationName, **argv); 126 fprintf(stderr, invalid_option, applet_name, **argv);
129 usage(appUsage); 127 usage(appUsage);
130 } 128 }
131 } 129 }
@@ -133,7 +131,7 @@ int chmod_chown_chgrp_main(int argc, char **argv)
133 } 131 }
134 132
135 if (argc == 0 || *argv == NULL) { 133 if (argc == 0 || *argv == NULL) {
136 fprintf(stderr, too_few_args, invocationName); 134 fprintf(stderr, too_few_args, applet_name);
137 usage(appUsage); 135 usage(appUsage);
138 } 136 }
139 137
@@ -172,14 +170,14 @@ int chmod_chown_chgrp_main(int argc, char **argv)
172 uid = my_getpwnam(*argv); 170 uid = my_getpwnam(*argv);
173 if (uid == -1) { 171 if (uid == -1) {
174 fatalError( "%s: unknown user name: %s\n", 172 fatalError( "%s: unknown user name: %s\n",
175 invocationName, *argv); 173 applet_name, *argv);
176 } 174 }
177 } 175 }
178 } 176 }
179 177
180 /* Ok, ready to do the deed now */ 178 /* Ok, ready to do the deed now */
181 if (argc <= 1) { 179 if (argc <= 1) {
182 fatalError( "%s: too few arguments\n", invocationName); 180 fatalError( "%s: too few arguments\n", applet_name);
183 } 181 }
184 while (argc-- > 1) { 182 while (argc-- > 1) {
185 if (recursiveAction (*(++argv), recursiveFlag, FALSE, FALSE, 183 if (recursiveAction (*(++argv), recursiveFlag, FALSE, FALSE,
@@ -189,7 +187,7 @@ int chmod_chown_chgrp_main(int argc, char **argv)
189 exit(TRUE); 187 exit(TRUE);
190 188
191 bad_group: 189 bad_group:
192 fatalError( "%s: unknown group name: %s\n", invocationName, groupName); 190 fatalError( "%s: unknown group name: %s\n", applet_name, groupName);
193} 191}
194 192
195/* 193/*