src/lib/daemon.c in trema-0.2.5 vs src/lib/daemon.c in trema-0.2.6

@@ -1,8 +1,6 @@
 /*
- * Author: Yasuhito Takamiya <[e-mail]>
- *
  * Copyright (C) 2008-2012 NEC Corporation
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2, as
  * published by the Free Software Foundation.
@@ -123,10 +121,22 @@
 #undef kill
 #endif // kill
 #define kill mock_kill
 extern int mock_kill( pid_t pid, int sig );
 
+#ifdef readlink
+#undef readlink
+#endif // readlink
+#define readlink mock_readlink
+extern ssize_t mock_readlink( const char *path, char *buf, size_t bufsiz );
+
+#ifdef basename
+#undef basename
+#endif // basename
+#define basename mock_basename
+extern char *mock_basename( char *path );
+
 #ifdef rename
 #undef rename
 #endif // rename
 #define rename mock_rename
 extern int mock_rename( const char *oldpath, const char *newpath );
@@ -191,11 +201,11 @@
   if ( lockf( fd, F_TLOCK, 0 ) == -1 ) {
     die( "Could not acquire a lock on a PID file: %s", path );
   }
 
   char str[ PID_STRING_LENGTH ];
-  snprintf( str, sizeof( str ),"%d\n", getpid() );
+  snprintf( str, sizeof( str ), "%d\n", getpid() );
   str[ sizeof( str ) - 1 ] = '\0';
   ssize_t ret = write( fd, str, strlen( str ) );
   if ( ret == -1 ) {
     die( "Could not write a PID file: %s", path );
   }
@@ -264,9 +274,25 @@
   if ( ret < 0 ) {
     warn( "Failed to check process id %d ( %s [%d] ).", pid, strerror( errno ), errno );
     if ( errno == ESRCH ) {
       unlink( path );
     }
+    return -1;
+  }
+
+  char proc_path[ 32 ];
+  char exe_path[ PATH_MAX ];
+  sprintf( proc_path, "/proc/%d/exe", pid );
+  ssize_t readsiz = readlink( proc_path, exe_path, sizeof( exe_path ) - 1 );
+  if ( readsiz == -1 ) {
+    warn( "Failed to check process id %d ( %s [%d] ).", pid, strerror( errno ), errno );
+    return -1;
+  }
+  exe_path[ readsiz ] = '\0';
+
+  char *exe_name = basename( exe_path );
+  if ( strcmp( name, exe_name ) != 0 ) {
+    warn( "Failed to check process name %s ( %s [%d] ).", name, strerror( errno ), errno );
     return -1;
   }
 
   return pid;
 }