vapier 15/08/05 07:31:10 Modified: 003_all_coreutils-gentoo-uname.patch Log: switch to using GNU style
Revision Changes Path 1.4 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.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/coreutils/8.24/003_all_coreutils-gentoo-uname.patch?rev=1.4&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.3&r2=1.4 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.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- 003_all_coreutils-gentoo-uname.patch 5 Aug 2015 07:26:52 -0000 1.3 +++ 003_all_coreutils-gentoo-uname.patch 5 Aug 2015 07:31:10 -0000 1.4 @@ -3,7 +3,7 @@ Prob not suitable for upstream seeing as how it's 100% linux-specific http://lists.gnu.org/archive/html/bug-coreutils/2005-09/msg00063.html -Patch originally by Carlos E. Gorges <[email protected]>, but +Patch originally by Carlos E. Gorges <[email protected]>, but heavily reworked to suck less. To add support for additional platforms, check out the show_cpuinfo() @@ -15,7 +15,7 @@ # include <mach-o/arch.h> #endif -+#if defined(__linux__) ++#if defined (__linux__) +# define USE_PROCINFO +# define UNAME_HARDWARE_PLATFORM +#endif @@ -27,9 +27,9 @@ exit (status); } -+#if defined(USE_PROCINFO) ++#if defined (USE_PROCINFO) + -+# if defined(__s390__) || defined(__s390x__) ++# if defined (__s390__) || defined (__s390x__) +# define CPUINFO_FILE "/proc/sysinfo" +# define CPUINFO_FORMAT "%64[^\t :]%*[ :]%256[^\n]%c" +# else @@ -40,81 +40,81 @@ +# define PROCINFO_PROCESSOR 0 +# define PROCINFO_HARDWARE_PLATFORM 1 + -+static void __eat_cpuinfo_space(char *buf) ++static void __eat_cpuinfo_space (char *buf) +{ + /* first eat trailing space */ -+ char *tmp = buf + strlen(buf) - 1; -+ while (tmp > buf && isspace(*tmp)) ++ char *tmp = buf + strlen (buf) - 1; ++ while (tmp > buf && isspace (*tmp)) + *tmp-- = '\0'; + /* then eat leading space */ + tmp = buf; -+ while (*tmp && isspace(*tmp)) ++ while (*tmp && isspace (*tmp)) + tmp++; + if (tmp != buf) -+ memmove(buf, tmp, strlen(tmp)+1); ++ memmove (buf, tmp, strlen (tmp) + 1); + /* finally collapse whitespace */ + tmp = buf; + while (tmp[0] && tmp[1]) { -+ if (isspace(tmp[0]) && isspace(tmp[1])) { -+ memmove(tmp, tmp+1, strlen(tmp)); ++ if (isspace (tmp[0]) && isspace (tmp[1])) { ++ memmove (tmp, tmp + 1, strlen (tmp)); + continue; + } + ++tmp; + } +} + -+static int __linux_procinfo(int x, char *fstr, size_t s) ++static int __linux_procinfo (int x, char *fstr, size_t s) +{ + FILE *fp; + + const char * const procinfo_keys[] = { + /* --processor --hardware-platform */ -+ #if defined(__alpha__) ++ #if defined (__alpha__) + "cpu model", "system type" -+ #elif defined(__arm__) ++ #elif defined (__arm__) + "Processor", "Hardware" -+ #elif defined(__avr32__) ++ #elif defined (__avr32__) + "processor", "cpu family" -+ #elif defined(__bfin__) ++ #elif defined (__bfin__) + "CPU", "BOARD Name" -+ #elif defined(__cris__) ++ #elif defined (__cris__) + "cpu", "cpu model" -+ #elif defined(__frv__) ++ #elif defined (__frv__) + "CPU-Core", "System" -+ #elif defined(__i386__) || defined(__x86_64__) ++ #elif defined (__i386__) || defined (__x86_64__) + "model name", "vendor_id" -+ #elif defined(__ia64__) ++ #elif defined (__ia64__) + "model name", "vendor" -+ #elif defined(__hppa__) ++ #elif defined (__hppa__) + "cpu", "model" -+ #elif defined(__m68k__) ++ #elif defined (__m68k__) + "CPU", "MMU" -+ #elif defined(__microblaze__) ++ #elif defined (__microblaze__) + "CPU-Ver", "FPGA-Arch" -+ #elif defined(__mips__) ++ #elif defined (__mips__) + "cpu model", "system type" -+ #elif defined(__powerpc__) || defined(__powerpc64__) ++ #elif defined (__powerpc__) || defined (__powerpc64__) + "cpu", "machine" -+ #elif defined(__s390__) || defined(__s390x__) ++ #elif defined (__s390__) || defined (__s390x__) + "Type", "Manufacturer" -+ #elif defined(__sh__) ++ #elif defined (__sh__) + "cpu type", "machine" -+ #elif defined(sparc) || defined(__sparc__) ++ #elif defined (sparc) || defined (__sparc__) + "type", "cpu" -+ #elif defined(__vax__) ++ #elif defined (__vax__) + "cpu type", "cpu" + #else + "unknown", "unknown" + #endif + }; + -+ if ((fp = fopen(CPUINFO_FILE, "r")) != NULL) { ++ if ((fp = fopen (CPUINFO_FILE, "r")) != NULL) { + char key[65], value[257], eol, *ret = NULL; + -+ while (fscanf(fp, CPUINFO_FORMAT, key, value, &eol) != EOF) { -+ __eat_cpuinfo_space(key); -+ if (!strcmp(key, procinfo_keys[x])) { -+ __eat_cpuinfo_space(value); ++ while (fscanf (fp, CPUINFO_FORMAT, key, value, &eol) != EOF) { ++ __eat_cpuinfo_space (key); ++ if (!strcmp (key, procinfo_keys[x])) { ++ __eat_cpuinfo_space (value); + ret = value; + break; + } @@ -123,14 +123,14 @@ + * length limit caused us to read right up to the + * newline ... doing "%*[^\n]\n" wont eat the newline + */ -+ fscanf(fp, "%*[^\n]"); -+ fscanf(fp, "\n"); ++ fscanf (fp, "%*[^\n]"); ++ fscanf (fp, "\n"); + } + } -+ fclose(fp); ++ fclose (fp); + + if (ret) { -+ strncpy(fstr, ret, s); ++ strncpy (fstr, ret, s); + return 0; + } + } @@ -148,10 +148,10 @@ { char const *element = unknown; -#if HAVE_SYSINFO && defined SI_ARCHITECTURE -+#if ( HAVE_SYSINFO && defined SI_ARCHITECTURE ) || defined(USE_PROCINFO) ++#if (HAVE_SYSINFO && defined SI_ARCHITECTURE) || defined (USE_PROCINFO) { static char processor[257]; -+#if defined(USE_PROCINFO) ++#if defined (USE_PROCINFO) + if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor)) +#else if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor)) @@ -163,7 +163,7 @@ if (element == unknown) { static char hardware_platform[257]; -+#if defined(USE_PROCINFO) ++#if defined (USE_PROCINFO) + if (0 <= __linux_procinfo (PROCINFO_HARDWARE_PLATFORM, hardware_platform, sizeof hardware_platform)) +#else size_t s = sizeof hardware_platform;
