d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert r250972 to fix build.

Browse Source
This commit is contained in:
gjb 2013-05-25 07:17:16 +00:00
parent 58d0c29676
commit 9877390809
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.bin/patch/patch.c
View File

@ -303,7 +303,7 @@ main(int argc, char *argv[])
++fuzz <= mymaxfuzz);
if (skip_rest_of_patch) { /* just got decided */
if (ferror(ofp) | fclose(ofp)) {
if (ferror(ofp) || fclose(ofp)) {
say("Error writing %s\n",
TMPOUTNAME);
error = 1;
@ -385,7 +385,7 @@ main(int argc, char *argv[])
}
}
}
if (ferror(rejfp) | fclose(rejfp)) {
if (ferror(rejfp) || fclose(rejfp)) {
say("Error writing %s\n", rejname);
error = 1;
}
@ -977,7 +977,7 @@ spew_output(void)
#endif
if (input_lines)
copy_till(input_lines, true); /* dump remainder of file */
rv = ferror(ofp) == 0 & fclose(ofp) == 0;
rv = ferror(ofp) == 0 && fclose(ofp) == 0;
ofp = NULL;
return rv;
}

2
usr.bin/patch/util.c
View File

@ -412,7 +412,7 @@ checked_in(char *file)
void
version(void)
{
fprintf(stderr, "patch 2.0-12u9 FreeBSD\n");
fprintf(stderr, "patch 2.0-12u8 FreeBSD\n");
my_exit(EXIT_SUCCESS);
}