Attachment 7050 Details for Bug 15555 – file.diff

[patch] file.diff

file.diff (text/plain), 1.38 KB, created by ca+freebsd on 1999-12-19 03:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ca+freebsd

Created: 1999-12-19 03:20:01 UTC

Size: 1.38 KB

patch

obsolete

>--- /usr/src/usr.bin/uudecode/uudecode.c	Sun Aug 29 08:34:23 1999
>+++ uudecode.c	Sat Dec 18 19:47:25 1999
>@@ -97,7 +97,6 @@
>         argc -= optind;
>         argv += optind;
> 
>-			
> 	if (*argv) {
> 		rval = 0;
> 		do {
>@@ -141,11 +140,10 @@
> 	struct passwd *pw;
> 	register int n;
> 	register char ch, first, *p;
>-	int mode, n1;
>+	int mode, n1, l;
> 	char buf[MAXPATHLEN];
> 	char buffn[MAXPATHLEN]; /* file name buffer */
> 
>-	
> 	/* search for header line */
> 	do {
> 		if (!fgets(buf, sizeof(buf), stdin)) {
>@@ -198,7 +196,8 @@
> 
> 	else {
> 		if (iflag && !access(buf, F_OK))
>-			(void)fprintf(stderr, "not overwritten: %s\n", buf);
>+			(void)fprintf(stderr, "%s: not overwritten: %s\n",
>+				filename, buf);
> 		if (!freopen(buf, "w", stdout) ||
> 		    fchmod(fileno(stdout), mode&0666)) {
> 			warn("%s: %s", buf, filename);
>@@ -208,7 +207,7 @@
> 	strcpy(buffn, buf); /* store file name from header line */
> 
> 	/* for each input line */
>-	for (;;) {
>+	for (l = 0;; l++) {
> 		if (!fgets(p = buf, sizeof(buf), stdin)) {
> 			warnx("%s: short file", filename);
> 			return(1);
>@@ -220,8 +219,8 @@
> #define OUT_OF_RANGE \
> {	\
>     warnx( \
>-"\n\tinput file: %s\n\tencoded file: %s\n\tcharacter out of range: [%d-%d]", \
>- 	filename, buffn, 1 + ' ', 077 + ' ' + 1); \
>+"\n\tinput file: %s\n\tencoded file: %s\n\tcharacter out of range: [%d-%d] at %d", \
>+ 	filename, buffn, 1 + ' ', 077 + ' ' + 1, l); \
>         return(1); \
> }

Actions: View | Diff

Attachments on bug 15555: 7050