tolerate IA-64 headers w/o PAGE_SIZE

diff --git a/NEWS b/NEWS
index 56a0e2f70a3f055f05a4a292f862d57ca60c61a2..068a4b34fd4c4e3035a16382ac747adaa141adee 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ procps-3.2.1 --> procps-3.2.2
 move striping from install command to CFLAGS
 now using gcc -fweb and -frename-registers options
 avoid warning about -lncurses when not linking -- thanks FLWM
+tolerate IA-64 headers without PAGE_SIZE
 watch: allow sub-second intervals -- thanks Thomas Stewart
 sysctl: -q option
 sysctl: better error handling of failed writes

diff --git a/proc/devname.c b/proc/devname.c
index e5defd464165ed9906bb2e5d7956b91d66a8717d..13412fc491ddebc7eeb7b2e8114a4a716b1e2a6b 100644 (file)
--- a/proc/devname.c
+++ b/proc/devname.c
@@ -19,10 +19,10 @@
 #include "version.h"
 #include "devname.h"
 
-#include <asm/page.h>
-#ifndef PAGE_SIZE
-#define PAGE_SIZE (sizeof(long)*1024)
-#endif
+// This is the buffer size for a tty name. Any path is legal,
+// which makes PAGE_SIZE appropriate (see kernel source), but
+// that is only 99% portable and utmp only holds 32 anyway.
+#define NAME_SIZE 128
 
 /* Who uses what:
  *
@@ -216,7 +216,7 @@ static int link_name(char *restrict const buf, unsigned maj, unsigned min, int p
   char path[32];
   int count;
   sprintf(path, "/proc/%d/%s", pid, name);  /* often permission denied */
-  count = readlink(path,buf,PAGE_SIZE-1);
+  count = readlink(path,buf,NAME_SIZE-1);
   if(count == -1) return 0;
   buf[count] = '\0';
   if(stat(buf, &sbuf) < 0) return 0;
@@ -227,7 +227,7 @@ static int link_name(char *restrict const buf, unsigned maj, unsigned min, int p
 
 /* number --> name */
 unsigned dev_to_tty(char *restrict ret, unsigned chop, dev_t dev_t_dev, int pid, unsigned int flags) {
-  static char buf[PAGE_SIZE];
+  static char buf[NAME_SIZE];
   char *restrict tmp = buf;
   unsigned dev = dev_t_dev;
   unsigned i = 0;