Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-07-15 15:29:07 +00:00
Code Issues Projects Releases Wiki Activity

Patch from Marc Nijdam <marc_nijdam@hp.com>

Browse Source 
> First (of many more) patch of cp_mv to getopt use. I'm using the most
> simplistic approach, just get getopt used,  then worry about a cleaner
> option parsing style using getopt later.
>
> Marc
This commit is contained in:
Eric Andersen 2000-07-13 18:42:58 +00:00
parent 55380700d8
commit f4c022649b
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cp_mv.c
View File

@ -41,6 +41,7 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
#include <getopt.h>
#define is_cp 0 #define is_cp 0
#define is_mv 1 #define is_mv 1
@ -189,21 +190,21 @@ rm_Action(const char *fileName, struct stat *statbuf, void* junk)
extern int cp_mv_main(int argc, char **argv) extern int cp_mv_main(int argc, char **argv)
{ {
int i;
char c;
if (*applet_name == 'c' && *(applet_name + 1) == 'p') if (*applet_name == 'c' && *(applet_name + 1) == 'p')
dz_i = is_cp; dz_i = is_cp;
else else
dz_i = is_mv; dz_i = is_mv;
if (argc < 3) if (argc < 3)
usage(cp_mv_usage[dz_i]); usage(cp_mv_usage[dz_i]);
argc--;
argv++;
if (dz_i == is_cp) { if (dz_i == is_cp) {
recursiveFlag = preserveFlag = forceFlag = FALSE; recursiveFlag = preserveFlag = forceFlag = FALSE;
followLinks = TRUE; followLinks = TRUE;
while (*argv && **argv == '-') { while ((c = getopt(argc, argv, "adpRf")) != EOF) {
while (*++(*argv)) { switch (c) {
switch (**argv) {
case 'a': case 'a':
followLinks = FALSE; followLinks = FALSE;
preserveFlag = TRUE; preserveFlag = TRUE;
@ -224,11 +225,8 @@ extern int cp_mv_main(int argc, char **argv)
default: default:
usage(cp_mv_usage[is_cp]); usage(cp_mv_usage[is_cp]);
} }
}
argc--;
argv++;
} }
if (argc < 2) { if ((argc - optind) < 2) {
usage(cp_mv_usage[dz_i]); usage(cp_mv_usage[dz_i]);
} }
} else { /* (dz_i == is_mv) */ } else { /* (dz_i == is_mv) */
@ -252,12 +250,12 @@ extern int cp_mv_main(int argc, char **argv)
goto exit_false; goto exit_false;
} }
while (argc-- > 1) { for (i = optind; i < (argc-1); i++) {
size_t srcLen; size_t srcLen;
volatile int flags_memo; volatile int flags_memo;
int status; int status;
baseSrcName = *(argv++); baseSrcName=argv[i];
if ((srcLen = strlen(baseSrcName)) > BUFSIZ) if ((srcLen = strlen(baseSrcName)) > BUFSIZ)
name_too_long__exit(); name_too_long__exit();