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

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

Author: jaguarondi
Date: 2007-06-18 18:04:29 +0200 (Mon, 18 Jun 2007)
New Revision: 396

Modified:
   daemon/trunk/Makefile
   daemon/trunk/README
   daemon/trunk/libs/USBDaemon_globals.h
   daemon/trunk/main.c
Log:
* Renamed tuxdaemon into tuxd.


Modified: daemon/trunk/Makefile
===================================================================
--- daemon/trunk/Makefile	2007-06-18 16:02:36 UTC (rev 395)
+++ daemon/trunk/Makefile	2007-06-18 16:04:29 UTC (rev 396)
@@ -15,7 +15,7 @@
 ifeq ($(CFG),Debug)
   OBJ_DIR = Debug
   OUTPUT_DIR = .
-  TARGET = tuxdaemon
+  TARGET = tuxd
   C_INCLUDE_DIRS = -I"/usr/include/glib-2.0" -I"/usr/lib/glib-2.0/include" -I"/usr/local/include"
   C_PREPROC =
   CFLAGS = -pipe  -Wall -Werror -g2 -O0 -DUSB_DEBUG

Modified: daemon/trunk/README
===================================================================
--- daemon/trunk/README	2007-06-18 16:02:36 UTC (rev 395)
+++ daemon/trunk/README	2007-06-18 16:04:29 UTC (rev 396)
@@ -2,14 +2,18 @@
 
 TUX Daemon is a daemon to control the tuxdroid robot.
 
-usage : tuxdaemon [options]
-options:
-    -d    start in daemon mode
-    -v    view in shell ( for daemon mode )
-    -st   show the structure of the usb frames
-    -sr   show all raw status
-    -si   show only invalid raw status
-    -h    show this usage list
+usage : tuxd [options]
+           options:
+               -d      start in daemon mode
+               -lsys   log to syslog
+               -ltux   log to /var/log/tuxd
+               -lstd   log to stdout & stderr
+               -v      view in shell (deprecated, use -lstd instead)
+               -debug  start in debug mode
+               -st     show the structure of the usb frames
+               -sr     show all raw status
+               -si     show only invalid raw status
+               -h      show this usage list
 
 For all information about tuxdroid, please visit:
 

Modified: daemon/trunk/libs/USBDaemon_globals.h
===================================================================
--- daemon/trunk/libs/USBDaemon_globals.h	2007-06-18 16:02:36 UTC (rev 395)
+++ daemon/trunk/libs/USBDaemon_globals.h	2007-06-18 16:04:29 UTC (rev 396)
@@ -31,7 +31,7 @@
 /*_____________________ D E F I N E S ______________________________________*/
 
 /** Name of the daemon */
-#define TUX_DAEMON_NAME             "tuxdaemon"
+#define TUX_DAEMON_NAME             "tuxd"
 
 #define TUX_PID                     0xFF07
 #define TUX_VID                     0x03EB

Modified: daemon/trunk/main.c
===================================================================
--- daemon/trunk/main.c	2007-06-18 16:02:36 UTC (rev 395)
+++ daemon/trunk/main.c	2007-06-18 16:04:29 UTC (rev 396)
@@ -188,7 +188,7 @@
     if (daemonized && remove_pid())
         log_error("Could not delete PID file");
 
-    log_info("tuxdaemon stopped");
+    log_info("tuxd stopped");
     log_close();
 }
 
@@ -304,11 +304,11 @@
 /************************************************************************ */
 static void usage(void)
 {
-    printf("usage : tuxdaemon [options]\n"
+    printf("usage : tuxd [options]\n"
            "options:\n"
            "    -d      start in daemon mode\n"
            "    -lsys   log to syslog\n"
-           "    -ltux   log to /var/log/tuxdaemon\n"
+           "    -ltux   log to /var/log/tuxd\n"
            "    -lstd   log to stdout & stderr\n"
            "    -v      view in shell (deprecated, use -lstd instead)\n"
            "    -debug  start in debug mode\n"
@@ -367,7 +367,7 @@
     /* Only one instance of the daemon is allowed */
     if (check_pid())
     {
-        printf("tuxdaemon is already running!\n");
+        printf("tuxd is already running!\n");
         exit(0);
     }