patch.c.diff

logan1, 04/30/2012 10:13 PM

Download (898 Bytes)

View differences:

usr.bin/patch/patch.c
394 394
				    sizeof(rejname)) >= sizeof(rejname))
395 395
					fatal("filename %s is too long\n", outname);
396 396
			}
397
			if (skip_rest_of_patch) {
398
				say("%d out of %d hunks ignored--saving rejects to %s\n",
399
				    failed, hunk, rejname);
400
			} else {
401
				say("%d out of %d hunks failed--saving rejects to %s\n",
402
				    failed, hunk, rejname);
397
			if (check_only == false) {
398
				if (skip_rest_of_patch) {
399
					say("%d out of %d hunks ignored--saving rejects to %s\n",
400
				    	failed, hunk, rejname);
401
				} else {
402
					say("%d out of %d hunks failed--saving rejects to %s\n",
403
				    	failed, hunk, rejname);
404
				}
403 405
			}
404 406
			if (!check_only && move_file(TMPREJNAME, rejname) < 0)
405 407
				trejkeep = true;