projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Function name cleanup.
[oweals/busybox.git]
/
chmod_chown_chgrp.c
diff --git
a/chmod_chown_chgrp.c
b/chmod_chown_chgrp.c
index c0e380a8ebc7451e5ed1ad19e10167babf60e94f..d3e267827a15506f226fb97d3ad822c2e5dd4de1 100644
(file)
--- a/
chmod_chown_chgrp.c
+++ b/
chmod_chown_chgrp.c
@@
-25,6
+25,7
@@
#include "internal.h"
#define BB_DECLARE_EXTERN
#define bb_need_invalid_option
#include "internal.h"
#define BB_DECLARE_EXTERN
#define bb_need_invalid_option
+#define bb_need_too_few_args
#include "messages.c"
#include <stdio.h>
#include "messages.c"
#include <stdio.h>
@@
-100,8
+101,8
@@
static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
int chmod_chown_chgrp_main(int argc, char **argv)
{
int recursiveFlag = FALSE;
int chmod_chown_chgrp_main(int argc, char **argv)
{
int recursiveFlag = FALSE;
- char *groupName;
- char *p;
+ char *groupName
=NULL
;
+ char *p
=NULL
;
const char *appUsage;
whichApp = (strcmp(*argv, "chown") == 0)?
const char *appUsage;
whichApp = (strcmp(*argv, "chown") == 0)?
@@
-114,24
+115,28
@@
int chmod_chown_chgrp_main(int argc, char **argv)
if (argc < 2)
usage(appUsage);
invocationName = *argv;
if (argc < 2)
usage(appUsage);
invocationName = *argv;
- argc--;
argv++;
/* Parse options */
argv++;
/* Parse options */
- while (
argc
&& (**argv == '-')) {
- while (*++(*argv))
+ while (
--argc >= 0 && *argv
&& (**argv == '-')) {
+ while (*++(*argv))
{
switch (**argv) {
switch (**argv) {
- case 'R':
- recursiveFlag = TRUE;
- break;
- default:
- fprintf(stderr, invalid_option, invocationName, **argv);
- usage(appUsage);
+
case 'R':
+
recursiveFlag = TRUE;
+
break;
+
default:
+
fprintf(stderr, invalid_option, invocationName, **argv);
+
usage(appUsage);
}
}
- argc--;
+ }
argv++;
}
argv++;
}
+ if (argc == 0 || *argv == NULL) {
+ fprintf(stderr, too_few_args, invocationName);
+ usage(appUsage);
+ }
+
if (whichApp == CHMOD_APP) {
theMode = *argv;
} else {
if (whichApp == CHMOD_APP) {
theMode = *argv;
} else {