===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/unifdef/unifdef.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -c -r1.25 -r1.26
*** src/usr.bin/unifdef/unifdef.c	2015/12/04 21:23:19	1.25
--- src/usr.bin/unifdef/unifdef.c	2015/12/10 19:10:46	1.26
***************
*** 1217,1225 ****
  					cp += 2;
  			} else if (strncmp(cp, "\n", 1) == 0) {
  				if (incomment == CHAR_LITERAL)
! 					error("unterminated char literal");
  				else
! 					error("unterminated string literal");
  			} else
  				cp += 1;
  			continue;
--- 1217,1225 ----
  					cp += 2;
  			} else if (strncmp(cp, "\n", 1) == 0) {
  				if (incomment == CHAR_LITERAL)
! 					error("Unterminated char literal");
  				else
! 					error("Unterminated string literal");
  			} else
  				cp += 1;
  			continue;
***************
*** 1493,1499 ****
  	if ((cp = matchsym("define", kw)) != NULL) {
  		sym = getsym(&cp);
  		if (sym == NULL)
! 			error("missing macro name in #define");
  		if (*cp == '(') {
  			val = "1";
  		} else {
--- 1493,1499 ----
  	if ((cp = matchsym("define", kw)) != NULL) {
  		sym = getsym(&cp);
  		if (sym == NULL)
! 			error("Missing macro name in #define");
  		if (*cp == '(') {
  			val = "1";
  		} else {
***************
*** 1505,1516 ****
  	} else if ((cp = matchsym("undef", kw)) != NULL) {
  		sym = getsym(&cp);
  		if (sym == NULL)
! 			error("missing macro name in #undef");
  		cp = skipcomment(cp);
  		debug("#undef");
  		addsym2(false, sym, NULL);
  	} else {
! 		error("unrecognized preprocessor directive");
  	}
  	skipline(cp);
  done:
--- 1505,1516 ----
  	} else if ((cp = matchsym("undef", kw)) != NULL) {
  		sym = getsym(&cp);
  		if (sym == NULL)
! 			error("Missing macro name in #undef");
  		cp = skipcomment(cp);
  		debug("#undef");
  		addsym2(false, sym, NULL);
  	} else {
! 		error("Unrecognized preprocessor directive");
  	}
  	skipline(cp);
  done:
***************
*** 1582,1588 ****
  		warnx("%s: %d: %s (#if line %d depth %d)",
  		    filename, linenum, msg, stifline[depth], depth);
  	closeio();
! 	errx(2, "output may be truncated");
  }
  
  static FILE *
--- 1582,1588 ----
  		warnx("%s: %d: %s (#if line %d depth %d)",
  		    filename, linenum, msg, stifline[depth], depth);
  	closeio();
! 	errx(2, "Output may be truncated");
  }
  
  static FILE *