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

Small space changes

Browse Source 
Mostly to keep in sync with OpenBSD and update the TAG.

Obtained from:	OpenBSD
MFC after:	5 days
This commit is contained in:
Pedro F. Giffuni 2014-12-07 20:32:24 +00:00
parent ab761cdbfa
commit 2b468ebac3
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=275582
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
usr.bin/patch/pch.c
View File

@ -24,7 +24,7 @@
* -C option added in 1998, original code by Marc Espie, based on FreeBSD * -C option added in 1998, original code by Marc Espie, based on FreeBSD
* behaviour * behaviour
* *
* $OpenBSD: pch.c,v 1.40 2013/07/11 12:39:31 otto Exp $ * $OpenBSD: pch.c,v 1.43 2014/11/18 17:03:35 tobias Exp $
* $FreeBSD$ * $FreeBSD$
*/ */
@ -319,7 +319,8 @@ intuit_diff_type(void)
for (t = s + 7; isspace((unsigned char)*t); t++) for (t = s + 7; isspace((unsigned char)*t); t++)
; ;
revision = savestr(t); revision = savestr(t);
for (t = revision; *t && !isspace((unsigned char)*t); t++) for (t = revision;
*t && !isspace((unsigned char)*t); t++)
; ;
*t = '\0'; *t = '\0';
if (*revision == '\0') { if (*revision == '\0') {
@ -585,7 +586,8 @@ another_hunk(void)
p_end--; p_end--;
return false; return false;
} }
for (s = buf; *s && !isdigit((unsigned char)*s); s++) for (s = buf;
*s && !isdigit((unsigned char)*s); s++)
; ;
if (!*s) if (!*s)
malformed(); malformed();
@ -595,7 +597,8 @@ another_hunk(void)
while (isdigit((unsigned char)*s)) while (isdigit((unsigned char)*s))
s++; s++;
if (*s == ',') { if (*s == ',') {
for (; *s && !isdigit((unsigned char)*s); s++) for (;
*s && !isdigit((unsigned char)*s); s++)
; ;
if (!*s) if (!*s)
malformed(); malformed();
@ -692,8 +695,8 @@ another_hunk(void)
change_line: change_line:
if (buf[1] == '\n' && canonicalize) if (buf[1] == '\n' && canonicalize)
strlcpy(buf + 1, " \n", buf_size - 1); strlcpy(buf + 1, " \n", buf_size - 1);
if (!isspace((unsigned char)buf[1]) && buf[1] != '>' && if (!isspace((unsigned char)buf[1]) &&
buf[1] != '<' && buf[1] != '>' && buf[1] != '<' &&
repl_beginning && repl_could_be_missing) { repl_beginning && repl_could_be_missing) {
repl_missing = true; repl_missing = true;
goto hunk_done; goto hunk_done;
@ -1422,8 +1425,8 @@ do_ed_script(void)
for (t = buf; isdigit((unsigned char)*t) || *t == ','; t++) for (t = buf; isdigit((unsigned char)*t) || *t == ','; t++)
; ;
/* POSIX defines allowed commands as {a,c,d,i,s} */ /* POSIX defines allowed commands as {a,c,d,i,s} */
if (isdigit((unsigned char)*buf) && (*t == 'a' || *t == 'c' || if (isdigit((unsigned char)*buf) &&
*t == 'd' || *t == 'i' || *t == 's')) { (*t == 'a' || *t == 'c' || *t == 'd' || *t == 'i' || *t == 's')) {
if (pipefp != NULL) if (pipefp != NULL)
fputs(buf, pipefp); fputs(buf, pipefp);
if (*t != 'd') { if (*t != 'd') {