X-Git-Url: https://git.deb.at/w?p=pkg%2Fmmv.git;a=blobdiff_plain;f=mmv.c;h=2e72a731e426c3378d5887c355abda40d337e3e7;hp=f95772e42f1e28e19cf53e1955afbddb9a8302b2;hb=ae57d8605e1126f173624c2d2df0e9f25e5af0c1;hpb=9ca71a388a3849345b28a95c5dffa16bb9da4065

diff --git a/mmv.c b/mmv.c
index f95772e..2e72a73 100644
--- a/mmv.c
+++ b/mmv.c
@@ -62,8 +62,7 @@ static char USAGE[] =
 %s [-m|x%s|c|o|a|z] [-h] [-d|p] [-g|t] [-v|n] [from to]\n\
 \n\
 Use #N in the ``to'' pattern to get the string matched\n\
-by the N'th ``from'' pattern wildcard.\n\
-Use -- as the end of options.\n";
+by the N'th ``from'' pattern wildcard.\n";
 
 #define OTHEROPT (_osmajor < 3 ? "" : "|r")
 
@@ -76,9 +75,7 @@ Use #[l|u]N in the ``to'' pattern to get the [lowercase|uppercase of the]\n\
 string matched by the N'th ``from'' pattern wildcard.\n\
 \n\
 A ``from'' pattern containing wildcards should be quoted when given\n\
-on the command line. Also you may need to quote ``to'' pattern.\n\
-\n\
-Use -- as the end of options.\n";
+on the command line.\n";
 
 #ifdef IS_SYSV
 #define OTHEROPT ""
@@ -88,7 +85,6 @@ Use -- as the end of options.\n";
 
 #endif
 
-#include <unistd.h>
 #include <stdio.h>
 #include <ctype.h>
 
@@ -124,11 +120,14 @@ extern unsigned _stklen = 10000;
 #else
 /* for various flavors of UN*X */
 
-#include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/file.h>
 
+extern char *getenv();
+extern long lseek();
+extern char *malloc();
+
 #ifdef HAS_DIRENT
 #include <dirent.h>
 typedef struct dirent DIRENTRY;
@@ -391,7 +390,7 @@ static int movealias(/* REP *first, REP *p, int *pprintaliased */);
 static int snap(/* REP *first, REP *p */);
 static void showdone(/* REP *fin */);
 static void breakout(/*  */);
-static void breakrep(int);
+static int breakrep(/* */);
 static void breakstat(/* */);
 static void quit(/*  */);
 static int copymove(/* REP *p */);
@@ -437,7 +436,7 @@ static CHUNK *freechunks = NULL;
 static SLICER slicer[2] = {{NULL, NULL, 0}, {NULL, NULL, 0}};
 
 static int badreps = 0, paterr = 0, direrr, failed = 0, gotsig = 0, repbad;
-static FILE *outfile;
+static FILE *outfile = stdout;
 
 static char IDF[] = "$$mmvdid.";
 static char TEMP[] = "$$mmvtmp.";
@@ -498,8 +497,6 @@ int main(argc, argv)
 {
 	char *frompat, *topat;
 
-	outfile = stdout;
-
 	init();
 	procargs(argc, argv, &frompat, &topat);
 	domatch(frompat, topat);
@@ -578,11 +575,6 @@ static void procargs(argc, argv, pfrompat, ptopat)
 	for (argc--, argv++; argc > 0 && **argv == '-'; argc--, argv++)
 		for (p = *argv + 1; *p != '\0'; p++) {
 			c = mylower(*p);
-			if (c == '-') {
-				argc--;
-				argv++;
-				goto endargs;
-			}
 			if (c == 'v' && !noex)
 				verbose = 1;
 			else if (c == 'n' && !verbose)
@@ -626,7 +618,6 @@ static void procargs(argc, argv, pfrompat, ptopat)
 			}
 		}
 
-endargs:
 	if (op == DFLT)
 		if (strcmp(cmdname, MOVENAME) == 0)
 			op = XMOVE;
@@ -1008,16 +999,20 @@ static int parsepat()
 				printf(TRAILESC, from, to, ESC);
 				return(-1);
 			}
-#ifdef IS_MSDOS
 		default:
 			if (
+#ifdef IS_MSDOS
 				c <= ' ' || c >= 127 ||
 				strchr(":/\\*?[]=+;,\"|<>", c) != NULL
+#else
+				c & 0x80
+#endif
 			) {
 				printf("%s -> %s : illegal character '%c' (0x%02X).\n",
 					from, to, c, c);
 				return(-1);
 			}
+#ifdef IS_MSDOS
 			if (isupper(c))
 				*p = c + ('a' - 'A');
 #endif
@@ -2583,10 +2578,10 @@ static void breakout()
 }
 
 
-static void breakrep(int signum)
+static int breakrep()
 {
 	gotsig = 1;
-	return;
+	return(1);
 }
 
 
@@ -2629,7 +2624,7 @@ static int copymove(p)
 
 static int copy(ff, len)
 	FILEINFO *ff;
-	off_t len;
+	long len;
 {
 	char buf[BUFSIZE], c;
 	int f, t, k, mode, perm;
@@ -2677,7 +2672,7 @@ static int copy(ff, len)
 		return(-1);
 	}
 	if (op & APPEND)
-		lseek(t, (off_t)0, SEEK_END);
+		lseek(t, 0L, 2);
 #ifdef IS_MSDOS
 	if (op & ZAPPEND && filelength(t) != 0) {
 		if (lseek(t, -1L, 1) == -1L || read(t, &c, 1) != 1) {
@@ -2689,10 +2684,10 @@ static int copy(ff, len)
 			lseek(t, -1L, 1);
 	}
 #endif
-	if ((op & APPEND) && len != (off_t)-1) {
+	if ((op & APPEND) && len != -1L) {
 		while (
 			len != 0 &&
-			(k = read(f, buf, (len > BUFSIZE) ? BUFSIZE : (size_t)len)) > 0 &&
+			(k = read(f, buf, len > BUFSIZE ? BUFSIZE : (unsigned)len)) > 0 &&
 			write(t, buf, k) == k
 		)
 			len -= k;