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

Update to upstrea version 2.5.6.

Browse Source 
Detect IO errors properly.
Write #line directives to the correct output stream.

Obtained from:	http://dotat.at/prog/unifdef
This commit is contained in:
Tony Finch 2011-01-21 18:10:11 +00:00
parent 03139a7106
commit 9bbfc2e646
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
usr.bin/unifdef/unifdef.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2002 - 2010 Tony Finch <dot@dotat.at> * Copyright (c) 2002 - 2011 Tony Finch <dot@dotat.at>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -57,7 +57,7 @@
#include <unistd.h> #include <unistd.h>
const char copyright[] = const char copyright[] =
"@(#) $Version: unifdef-2.5 $\n" "@(#) $Version: unifdef-2.5.6.21f1388 $\n"
"@(#) $FreeBSD$\n" "@(#) $FreeBSD$\n"
"@(#) $Author: Tony Finch (dot@dotat.at) $\n" "@(#) $Author: Tony Finch (dot@dotat.at) $\n"
"@(#) $URL: http://dotat.at/prog/unifdef $\n" "@(#) $URL: http://dotat.at/prog/unifdef $\n"
@ -549,6 +549,7 @@ state(Ifstate is)
/* /*
* Write a line to the output or not, according to command line options. * Write a line to the output or not, according to command line options.
* If writing fails, closeout() will print the error and exit.
*/ */
static void static void
flushline(bool keep) flushline(bool keep)
@ -561,21 +562,23 @@ flushline(bool keep)
delcount += 1; delcount += 1;
blankcount += 1; blankcount += 1;
} else { } else {
if (lnnum && delcount > 0) if (lnnum && delcount > 0 &&
printf("#line %d%s", linenum, newline); fprintf(output, "#line %d%s", linenum, newline) < 0)
fputs(tline, output); closeout();
if (fputs(tline, output) == EOF)
closeout();
delcount = 0; delcount = 0;
blankmax = blankcount = blankline ? blankcount + 1 : 0; blankmax = blankcount = blankline ? blankcount + 1 : 0;
} }
} else { } else {
if (lnblank) if (lnblank && fputs(newline, output) == EOF)
fputs(newline, output); closeout();
exitstat = 1; exitstat = 1;
delcount += 1; delcount += 1;
blankcount = 0; blankcount = 0;
} }
if (debugging) if (debugging && fflush(output) == EOF)
fflush(output); closeout();
} }
/* /*
@ -604,13 +607,13 @@ closeout(void)
{ {
if (symdepth && !zerosyms) if (symdepth && !zerosyms)
printf("\n"); printf("\n");
if (fclose(output) == EOF) { if (ferror(output) || fclose(output) == EOF) {
warn("couldn't write to %s", ofilename);
if (overwriting) { if (overwriting) {
warn("couldn't write to temporary file");
unlink(tempname); unlink(tempname);
errx(2, "%s unchanged", filename); errx(2, "%s unchanged", ofilename);
} else { } else {
exit(2); err(2, "couldn't write to %s", ofilename);
} }
} }
} }
@ -647,8 +650,12 @@ parseline(void)
Comment_state wascomment; Comment_state wascomment;
linenum++; linenum++;
if (fgets(tline, MAXLINE, input) == NULL) if (fgets(tline, MAXLINE, input) == NULL) {
return (LT_EOF); if (ferror(input))
error(strerror(errno));
else
return (LT_EOF);
}
if (newline == NULL) { if (newline == NULL) {
if (strrchr(tline, '\n') == strrchr(tline, '\r') + 1) if (strrchr(tline, '\n') == strrchr(tline, '\r') + 1)
newline = newline_crlf; newline = newline_crlf;
@ -722,7 +729,9 @@ parseline(void)
if (linestate == LS_HASH) { if (linestate == LS_HASH) {
size_t len = cp - tline; size_t len = cp - tline;
if (fgets(tline + len, MAXLINE - len, input) == NULL) { if (fgets(tline + len, MAXLINE - len, input) == NULL) {
/* append the missing newline */ if (ferror(input))
error(strerror(errno));
/* append the missing newline at eof */
strcpy(tline + len, newline); strcpy(tline + len, newline);
cp += strlen(newline); cp += strlen(newline);
linestate = LS_START; linestate = LS_START;