vapier 15/08/05 07:35:34 Modified: 003_all_coreutils-gentoo-uname.patch Log: switch to using GNU style for comments too
Revision Changes Path 1.6 src/patchsets/coreutils/8.24/003_all_coreutils-gentoo-uname.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/coreutils/8.24/003_all_coreutils-gentoo-uname.patch?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/coreutils/8.24/003_all_coreutils-gentoo-uname.patch?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/coreutils/8.24/003_all_coreutils-gentoo-uname.patch?r1=1.5&r2=1.6 Index: 003_all_coreutils-gentoo-uname.patch =================================================================== RCS file: /var/cvsroot/gentoo/src/patchsets/coreutils/8.24/003_all_coreutils-gentoo-uname.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- 003_all_coreutils-gentoo-uname.patch 5 Aug 2015 07:32:19 -0000 1.5 +++ 003_all_coreutils-gentoo-uname.patch 5 Aug 2015 07:35:34 -0000 1.6 @@ -24,7 +24,7 @@ #include "system.h" #include "error.h" #include "quote.h" -@@ -138,6 +144,119 @@ +@@ -138,6 +144,118 @@ exit (status); } @@ -43,17 +43,17 @@ + +static void __eat_cpuinfo_space (char *buf) +{ -+ /* first eat trailing space */ ++ /* First eat trailing space. */ + char *tmp = buf + strlen (buf) - 1; + while (tmp > buf && isspace (*tmp)) + *tmp-- = '\0'; -+ /* then eat leading space */ ++ /* Then eat leading space. */ + tmp = buf; + while (*tmp && isspace (*tmp)) + tmp++; + if (tmp != buf) + memmove (buf, tmp, strlen (tmp) + 1); -+ /* finally collapse whitespace */ ++ /* Finally collapse whitespace. */ + tmp = buf; + while (tmp[0] && tmp[1]) { + if (isspace (tmp[0]) && isspace (tmp[1])) { @@ -120,10 +120,9 @@ + break; + } + if (eol != '\n') { -+ /* we need two fscanf's here in case the previous -+ * length limit caused us to read right up to the -+ * newline ... doing "%*[^\n]\n" wont eat the newline -+ */ ++ /* We need two fscanf's here in case the previous length limit ++ * caused us to read right up to the newline. Doing something ++ * like "%*[^\n]\n" won't eat the newline. */ + ignore_value (fscanf (fp, "%*[^\n]")); + ignore_value (fscanf (fp, "\n")); + } @@ -144,7 +143,7 @@ /* Print ELEMENT, preceded by a space if something has already been printed. */ -@@ -250,10 +369,14 @@ main (int argc, char **argv) +@@ -250,10 +368,14 @@ main (int argc, char **argv) if (toprint & PRINT_PROCESSOR) { char const *element = unknown; @@ -160,7 +159,7 @@ element = processor; } #endif -@@ -306,9 +429,13 @@ main (int argc, char **argv) +@@ -306,9 +428,13 @@ main (int argc, char **argv) if (element == unknown) { static char hardware_platform[257];
