[tuxdroid-svn] r366 - in daemon/trunk: . libs

[neimad <c2m...@c2...>]

Author: neimad
Date: 2007-06-10 10:55:44 +0200 (Sun, 10 Jun 2007)
New Revision: 366

Modified:
   daemon/trunk/libs/USBDaemon_globals.h
   daemon/trunk/main.c
Log:
* Fixed type of daemon_pid: pid_t instead of unsigned short. Also use
  the pid returned by write_pid() instead of calling getpid() again.

  The two-byte masking trick performed in sub_daemon_req_info() was
  left unchanged.


Modified: daemon/trunk/libs/USBDaemon_globals.h
===================================================================
--- daemon/trunk/libs/USBDaemon_globals.h	2007-06-10 08:32:03 UTC (rev 365)
+++ daemon/trunk/libs/USBDaemon_globals.h	2007-06-10 08:55:44 UTC (rev 366)
@@ -25,6 +25,7 @@
 #define __USBDAEMON_GLOBALS_H__
 
 /*_____________________ I N C L U D E S____________________________________ */
+#include <unistd.h>
 #include <usb.h>
 
 /*_____________________ D E F I N E S ______________________________________*/
@@ -47,7 +48,7 @@
 /*_____________________ G L O B A L S _ V A R I A B L E S _______________________*/
 extern unsigned char show_frames;
 extern unsigned char show_raw_status;
-extern unsigned short daemon_pid;
+extern pid_t daemon_pid;
 extern unsigned char show_invalid_raw;
 
 #define MATURITY_LEN        9

Modified: daemon/trunk/main.c
===================================================================
--- daemon/trunk/main.c	2007-06-10 08:32:03 UTC (rev 365)
+++ daemon/trunk/main.c	2007-06-10 08:55:44 UTC (rev 366)
@@ -55,7 +55,7 @@
 unsigned char show_frames = 0;
 unsigned char show_raw_status = 0;
 unsigned char show_invalid_raw = 0;
-unsigned short daemon_pid = 0;
+pid_t daemon_pid = 0;
 unsigned char daemonized = 0;
 
 static uid_t user = (uid_t)-1;   /**< Initial user id */
@@ -280,11 +280,12 @@
         exit(1);
     }
 
-    daemon_pid = (unsigned short)getpid();
-    log_info("Tux USB Daemon started: pid = %d", (int)getpid());
-    if (!write_pid())
+    daemon_pid = write_pid();
+    if (daemon_pid == 0)
         exit(1);
 
+    log_info("Tux daemon started: pid = %d", daemon_pid);
+
     /* No shell */
     if (log_target != LOG_TARGET_SHELL)
     {