No longer use `glibtop_machine.h' for Linux.

1998-07-03  Martin baulig  <martin@home-of-linux.org>

	* macros/gnome-libgtop-sysdeps.m4: No longer use
	`glibtop_machine.h' for Linux.

	* sysdeps/linux/glibtop_machine.h: Removed.

	* sysdeps/guile/guile.awk: Using `scm_append'
	instead of `gh_append'.

	* sysdeps/guile/names/guile-names.awk: dito.

	* sysdeps/linux/*.c: Using code from stable branch again.

	* include/glibtop/parameter.h: New file.

	* lib/parameter.c: New file.

	* lib/{open, init}.c: Done some more work on server
	initialization

sysdeps/linux/prockernel.c

@@ -34,8 +34,9 @@ static const unsigned long _glibtop_sysdeps_proc_kernel =
 void
 glibtop_get_proc_kernel_s (glibtop *server, glibtop_proc_kernel *buf, pid_t pid)
 {
-	char buffer [BUFSIZ], input [BUFSIZ], *tmp;
-	int fd = 0, nread;
+	char input [BUFSIZ], *tmp;
+	int nread;
+	FILE *f;
 	
 	glibtop_init_r (&server, 0, 0);
 
@@ -48,24 +49,23 @@ glibtop_get_proc_kernel_s (glibtop *server, glibtop_proc_kernel *buf, pid_t pid)
 	}
 
 	sprintf (input, "/proc/%d/stat", pid);
-		
-	fd = open (input, O_RDONLY);
-	if (fd == -1)
-		glibtop_error_r (server, "open (%s): %s",
-				 input, strerror (errno));
-		
-	nread = read (fd, buffer, BUFSIZ);
-	if (nread == -1)
-		glibtop_error_r (server, "read (%s): %s",
-				 input, strerror (errno));
-		
-	buffer [nread] = 0;
-	close (fd);
-		
+
+	f = fopen (input, "r");
+	if (!f) return;
+	
+	nread = fread (input, 1, BUFSIZ, f);
+	
+	if (nread < 0) {
+		fclose (f);
+		return;
+	}
+	
+	input [nread] = 0;
+	
 	/* This is from guile-utils/gtop/proc/readproc.c */
 	
 	/* split into "PID (cmd" and "<rest>" */
-	tmp = strrchr (buffer, ')');
+	tmp = strrchr (input, ')');
 	*tmp = '\0';		/* replace trailing ')' with NUL */
 	/* parse these two strings separately, skipping the leading "(". */
 
@@ -76,6 +76,8 @@ glibtop_get_proc_kernel_s (glibtop *server, glibtop_proc_kernel *buf, pid_t pid)
 	       &buf->k_flags, &buf->min_flt, &buf->cmin_flt,
 	       &buf->maj_flt, &buf->cmaj_flt, &buf->kstk_esp,
 	       &buf->kstk_eip, &buf->wchan);
+	
+	fclose (f);
 
 	buf->flags = _glibtop_sysdeps_proc_kernel;
 }