prefork-interp: ident

[chiark-utils.git] / cprogs / prefork-interp.c

diff --git a/cprogs/prefork-interp.c b/cprogs/prefork-interp.c
index 61dcca93bf370a578bcd5a72cc5c4ad7b12c3360..fe02827c1d67466d325e801572efbc7932eeb144 100644 (file)
--- a/cprogs/prefork-interp.c
+++ b/cprogs/prefork-interp.c
@@ -426,21 +426,19 @@ static void ident_add_stat(const char *path) {
   int r = stat(path, &stab);
   if (r) diee("failed to stat %s", path);
 
-  IDENT_ADD_OBJ(stab.st_dev);
-  IDENT_ADD_OBJ(stab.st_ino);
+  IDENT_ADD_OBJ(path[0], stab.st_dev);
+  IDENT_ADD_OBJ('i',     stab.st_ino);
 }
 
 void ident_addinit(void) {
-  char magic = 1;
-
-  IDENT_ADD_OBJ(magic);
+  ident_add_key_byte(1);
 
   struct utsname uts = { };
   size_t utslen = sizeof(uts);
   int r = uname(&uts);
   if (r) diee("uname failed!");
-  IDENT_ADD_OBJ(utslen);
-  IDENT_ADD_OBJ(uts);
+  IDENT_ADD_OBJ('u', utslen);
+  IDENT_ADD_OBJ('u', uts);
 
   ident_add_stat(".");
   ident_add_stat("/");