Attachment #221499 for bug #252614

View | Details | Raw Unified | Return to bug 252614
Collapse All | Expand All

Lines 83-88 Link Here

(-)usr.bin/diff/diff.h (+1 lines)
83	#define D_MISMATCH2 4 /* path1 was a file, path2 a dir */	83	#define D_MISMATCH2 4 /* path1 was a file, path2 a dir */
84	#define D_SKIPPED1 5 /* path1 was a special file */	84	#define D_SKIPPED1 5 /* path1 was a special file */
85	#define D_SKIPPED2 6 /* path2 was a special file */	85	#define D_SKIPPED2 6 /* path2 was a special file */
		86	#define D_ERROR 7 /* A file access error occurred */
86		87
87	struct excludes {	88	struct excludes {
88	char *pattern;	89	char *pattern;

Lines 511-516 Link Here

(-)usr.bin/diff/diff.c (+2 lines)
511	printf("File %s%s is not a regular file or directory and was skipped\n",	511	printf("File %s%s is not a regular file or directory and was skipped\n",
512	path2, entry);	512	path2, entry);
513	break;	513	break;
		514	case D_ERROR:
		515	break;
514	}	516	}
515	}	517	}
516		518




			if ((f1 = opentemp(file1)) == NULL ||
			    fstat(fileno(f1), &stb1) == -1) {
				warn("%s", file1);
				rval = D_ERROR;
				status |= 2;
				goto closem;
			}

	}
	if (f1 == NULL) {
		warn("%s", file1);
		rval = D_ERROR;
		status |= 2;
		goto closem;
	}

			if ((f2 = opentemp(file2)) == NULL ||
			    fstat(fileno(f2), &stb2) == -1) {
				warn("%s", file2);
				rval = D_ERROR;
				status |= 2;
				goto closem;
			}

	}
	if (f2 == NULL) {
		warn("%s", file2);
		rval = D_ERROR;
		status |= 2;
		goto closem;
	}

		break;
	default:
		/* error */
		rval = D_ERROR;
		status |= 2;
		goto closem;
	}

Return to bug 252614

Lines 299-304 Link Here

(-)usr.bin/diff/diffreg.c (+5 lines)
299	if ((f1 = opentemp(file1)) == NULL \|\|	299	if ((f1 = opentemp(file1)) == NULL \|\|
300	fstat(fileno(f1), &stb1) == -1) {	300	fstat(fileno(f1), &stb1) == -1) {
301	warn("%s", file1);	301	warn("%s", file1);
		302	rval = D_ERROR;
302	status \|= 2;	303	status \|= 2;
303	goto closem;	304	goto closem;
304	}	305	}
Lines 309-314 Link Here
309	}	310	}
310	if (f1 == NULL) {	311	if (f1 == NULL) {
311	warn("%s", file1);	312	warn("%s", file1);
		313	rval = D_ERROR;
312	status \|= 2;	314	status \|= 2;
313	goto closem;	315	goto closem;
314	}	316	}
Lines 320-325 Link Here
320	if ((f2 = opentemp(file2)) == NULL \|\|	322	if ((f2 = opentemp(file2)) == NULL \|\|
321	fstat(fileno(f2), &stb2) == -1) {	323	fstat(fileno(f2), &stb2) == -1) {
322	warn("%s", file2);	324	warn("%s", file2);
		325	rval = D_ERROR;
323	status \|= 2;	326	status \|= 2;
324	goto closem;	327	goto closem;
325	}	328	}
Lines 330-335 Link Here
330	}	333	}
331	if (f2 == NULL) {	334	if (f2 == NULL) {
332	warn("%s", file2);	335	warn("%s", file2);
		336	rval = D_ERROR;
333	status \|= 2;	337	status \|= 2;
334	goto closem;	338	goto closem;
335	}	339	}
Lines 365-370 Link Here
365	break;	369	break;
366	default:	370	default:
367	/* error */	371	/* error */
		372	rval = D_ERROR;
368	status \|= 2;	373	status \|= 2;
369	goto closem;	374	goto closem;
370	}	375	}