1 diff -urN coreutils-5.2.1-orig/src/uname.c coreutils-5.2.1/src/uname.c
2 --- coreutils-5.2.1-orig/src/uname.c 2005-01-15 19:15:36.193346304 +0100
3 +++ coreutils-5.2.1/src/uname.c 2005-01-15 19:19:06.918311240 +0100
5 /* Operating system. */
6 #define PRINT_OPERATING_SYSTEM 128
8 +void __sysinfo_processor_type(char*);
10 static struct option const uname_long_options[] =
12 {"all", no_argument, NULL, 'a'},
14 if (toprint & PRINT_PROCESSOR)
16 char const *element = unknown;
17 -#if HAVE_SYSINFO && defined SI_ARCHITECTURE
19 - static char processor[257];
20 - if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
21 - element = processor;
24 + char processor[BUFSIZ];
25 + __sysinfo_processor_type(processor);
26 + element = processor;
27 #ifdef UNAME_PROCESSOR
28 if (element == unknown)
37 +return vendor_id from proc cpuinfo
41 +__sysinfo_processor_type (char* proc_info) {
43 + char *p,temp_string[BUFSIZ],final_string[BUFSIZ]="unknown";
45 + if ((ffd=fopen("/proc/cpuinfo", "r") )!=NULL) {
46 + while ( fscanf(ffd, "%s : ", temp_string) != EOF)
48 + if (!(strcmp(temp_string, "machine")))
49 + #endif /* __PPC__ */
51 + if (!(strcmp(temp_string, "cpu")))
52 + #endif /* __sparc__ */
53 + #if defined(__i386__) || defined(__x86_64__)
54 + if (!(strcmp(temp_string, "name")))
55 + #endif /* __x86__ */
57 + if (!(strcmp(temp_string, "model")))
58 + #endif /* __alpha__ */
60 + fgets(final_string, 64, ffd);
61 + while (p=strchr(final_string, ' ')) *p='_';
62 + while (p=strchr(final_string, '\n')) *p=0;
67 + strncpy(proc_info,final_string,BUFSIZ);