Rename binaries with dashes instead of underscores.

21 files changed, 54 insertions, 54 deletions

diff --git a/.gitignore b/.gitignore
index 8501e09..e819e72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,10 +2,10 @@
 # no tracked files are ignored as a result of any changes.
 
 # Project-specific targets
-/src/linpicker_server
-/src/linpicker_monitor
-/src/linpicker_debug
-/src/linpicker_track
+/src/linpicker-server
+/src/linpicker-monitor
+/src/linpicker-debug
+/src/linpicker-track
 /data/genimage
 /libvchan/node
 /libvchan/node-select
diff --git a/README b/README
index 7aa2be4..492790e 100644
--- a/README
+++ b/README
@@ -27,10 +27,10 @@ configure options:
 	events which will likely flood the log.
 
 --enable-socket (default: n)
-	Causes linpicker_server to listen on a local socket and enables
-	compilation of linpicker_cli which can be used to send commands to
-	linpicker_server.  Currently there is only one command which causes
-	linpicker_server to dump information about all views into the log.
+	Causes linpicker-server to listen on a local socket and enables
+	compilation of linpicker-cli which can be used to send commands to
+	linpicker-server.  Currently there is only one command which causes
+	linpicker-server to dump information about all views into the log.
 
 
 SETTING UP THE ENVIRONMENT AND GUESTS
@@ -63,19 +63,19 @@ this package does not currently include any as the ones used by the author are
 still under development.
 
 To use the "combined desktop" mode in which windows from multiple guests are
-combined, the "linpicker_track" program needs to be installed in each guest
+combined, the "linpicker-track" program needs to be installed in each guest
 and run as part of the guest X session; see below.
 
 RUNNING LINPICKER
 
-Linpicker consists of three parts, linpicker_monitor, linpicker_server, and
-the optional linpicker_track.
+Linpicker consists of three parts, linpicker-monitor, linpicker-server, and
+the optional linpicker-track.
 
-linpicker_monitor is a non-graphical program that waits for new guests to
+linpicker-monitor is a non-graphical program that waits for new guests to
 start and sets up the backend information in XenStore.  This program needs to
 be started before any guests that are intended to be used with Linpicker.
 
-linpicker_server is the actual display server that maps the guest framebuffers
+linpicker-server is the actual display server that maps the guest framebuffers
 and provides the user interface.  It can also detect new guests starting up,
 but it does not write XenStore at all, it just listens passively.
 
@@ -84,20 +84,20 @@ Both programs have no command line arguments.  They will create log files in
 This is for two reasons, 1) /dev/fb0 typically needs root permission to open,
 and more importantly, 2) most of the Xen operations such as mapping grant
 references, touching XenStore, etc. require root.  Moving to a model in which
-linpicker_monitor handles _all_ Xen operations should allow linpicker_server
+linpicker-monitor handles _all_ Xen operations should allow linpicker-server
 to be unprivileged; this is on the TODO list.
 
-The typical way to run Linpicker is to run linpicker_monitor at boot time
-(before xendomains) and then run linpicker_server from the command line.
-To get back to the command line once linpicker_server is run one can either
-ssh from one of the guests, or exit linpicker_server and then re-run it.
+The typical way to run Linpicker is to run linpicker-monitor at boot time
+(before xendomains) and then run linpicker-server from the command line.
+To get back to the command line once linpicker-server is run one can either
+ssh from one of the guests, or exit linpicker-server and then re-run it.
 
-linpicker_track provides the extra information needed to use the combined
+linpicker-track provides the extra information needed to use the combined
 desktop mode with X-Windows guests.  It needs to be run as part of the guest
 X session, unfortunately, in order to communicate using Xen primitives it
 needs to be run as root!  This could be done using setuid or sudo.  It works
 by passively tracking window position and location and forwarding this
-information to linpicker_server using a ring buffer.
+information to linpicker-server using a ring buffer.
 
 
 HISTORY OF LINPICKER
diff --git a/TODO b/TODO
index b0d9c69..37cc226 100644
--- a/TODO
+++ b/TODO
@@ -1,13 +1,13 @@
 * Make MS Windows framebuffer and input frontends available so that Linpicker can be used with
   Windows guests.  Also provide track support for Windows so the combined desktop can be used.
 
-* Move Linpicker to a model in which linpicker_monitor handles all privileged Xen operations,
-  including mapping guest framebuffers and sending input events, while linpicker_server acts as
+* Move Linpicker to a model in which linpicker-monitor handles all privileged Xen operations,
+  including mapping guest framebuffers and sending input events, while linpicker-server acts as
   a normal user application and requires no privilege.  This will require a client/server model
   probably using a local socket, with shared memory used to share the framebuffer.
 
 * Move away from DirectFB and legacy /dev/fb0.  Instead use the modern graphics stack including
-  DRI, GL, and KMS to implement linpicker_server.
+  DRI, GL, and KMS to implement linpicker-server.
 
 * Add desktop features to Linpicker including a clipboard, unified start menu (application
   launcher), and notification messages.
diff --git a/doc/XenIPC.txt b/doc/XenIPC.txt
index 14a75d0..ebbf83a 100644
--- a/doc/XenIPC.txt
+++ b/doc/XenIPC.txt
@@ -49,7 +49,7 @@ The Driver Domain and Client VM's communicate using the following channels:
   modifying ring buffer data.  The cases where the ring buffer is filled or
   inaccessible need to be handled gracefully as well.
 
-* Track protocol.  This is the application protocol used by linpicker_track to
+* Track protocol.  This is the application protocol used by linpicker-track to
   communicate view information via libvchan to Linpicker server.  Since the
   guest side is untrusted, this protocol needs to be robust against malicious
   behavior.  In particular, the number of views and buffers must be limited
diff --git a/doc/track_protocol.txt b/doc/track_protocol.txt
index 16d165d..ea3e58d 100644
--- a/doc/track_protocol.txt
+++ b/doc/track_protocol.txt
@@ -1,5 +1,5 @@
 This document describes the communications protocol used between
-linpicker_track and linpicker_server.  The mechanism used to transport the
+linpicker-track and linpicker-server.  The mechanism used to transport the
 messages is libvchan, a simple wrapper around a standard Xen ring buffer
 which is allocated by the guest and shared with the server domain using
 a grant reference and event channel.
@@ -12,13 +12,13 @@ including in this protocol.  If this is changed, an additional message will
 need to be added to allow a buffer to be selected.
 
 
-1. Messages sent from linpicker_track to linpicker_server: these are 32-byte
+1. Messages sent from linpicker-track to linpicker-server: these are 32-byte
 messages consisting of 8 uint32_t fields.  The first field is the type of
 message.  Please refer to src/comm_structs.h which contains the structure
 definition, message types, and flags.
 
 LINPICKER_RESET
-This message type requests that linpicker_server drop all of the views
+This message type requests that linpicker-server drop all of the views
 associated with the current buffer.
 
 LINPICKER_CREATE
@@ -45,11 +45,11 @@ LINPICKER_DESTROY
 The view specified in the view field should be removed.
 
 
-2. Messages sent from linpicker_server to linpicker_track: there is currently
+2. Messages sent from linpicker-server to linpicker-track: there is currently
 only one such message, consisting of a single byte type field.
 
 LINPICKER_REQUEST_UPDATE
-Requests that linpicker_track re-send all view information.  This should
-result in linpicker_track sending a RESET message followed by CREATE messages
-for all existing views.  Typically sent when linpicker_server is starting up
+Requests that linpicker-track re-send all view information.  This should
+result in linpicker-track sending a RESET message followed by CREATE messages
+for all existing views.  Typically sent when linpicker-server is starting up
 and existing guests are running, or the user can press a hotkey to trigger it.
diff --git a/src/Makefile.am b/src/Makefile.am
index c66bb73..724941c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-bin_PROGRAMS = linpicker_server linpicker_monitor linpicker_track
+bin_PROGRAMS = linpicker-server linpicker-monitor linpicker-track
 
 AM_CFLAGS = -I../libvchan $(DFB_CFLAGS) $(UDEV_CFLAGS) $(XCB_CFLAGS) \
 	    -DPKGDATADIR="\"$(pkgdatadir)\""
@@ -21,6 +21,6 @@ linpicker_track_SOURCES = track.c
 linpicker_track_LDADD = ../libvchan/libvchan.la -lxenctrl -lxenstore $(XCB_LIBS)
 
 if LOCALSOCK
-noinst_PROGRAMS = linpicker_debug
+noinst_PROGRAMS = linpicker-debug
 linpicker_debug_SOURCES = debug.c
 endif
diff --git a/src/comm.c b/src/comm.c
index 06ca63b..2eee7ff 100644
--- a/src/comm.c
+++ b/src/comm.c
@@ -11,9 +11,9 @@
  *
  * @section DESCRIPTION
  *
- * This is the code that handles incoming libvchan events from linpicker_track.
+ * This is the code that handles incoming libvchan events from linpicker-track.
  * This code shoud be robust against bad behavior on the  other side, as
- * we don't trust the guest that is running linpicker_track.
+ * we don't trust the guest that is running linpicker-track.
  */
 
 #include <sys/types.h>
diff --git a/src/debug.c b/src/debug.c
index cd00427..7946f0b 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -12,7 +12,7 @@
  * @section DESCRIPTION
  *
  * This is the linpicker_cli program that can send debugging commands to
- * linpicker_server over a local socket if linpicker_server was compiled
+ * linpicker-server over a local socket if linpicker-server was compiled
  * with the "enable-socket" configure-time option (default: disabled).
  */
 
@@ -42,7 +42,7 @@ main(int argc, char **argv)
 	int sd;
 
 	if (argc != 2)
-		bail("Usage: linpicker_debug <code>\n\t0 - Dump views\n");
+		bail("Usage: linpicker-debug <code>\n\t0 - Dump views\n");
 	msg = atoi(argv[1]);
 
 	sd = socket(AF_UNIX, SOCK_DGRAM, 0);
diff --git a/src/fd.c b/src/fd.c
index cecfdfe..37f135a 100644
--- a/src/fd.c
+++ b/src/fd.c
@@ -15,7 +15,7 @@
  * 1. Code to redirect stderr into a log file and simple logging functions.
  * 2. Generic filehandle tracking code for running a select loop.
  *
- * This code is shared between linpicker_server and linpicker_monitor.
+ * This code is shared between linpicker-server and linpicker-monitor.
  */
 
 #define _GNU_SOURCE
diff --git a/src/local.c b/src/local.c
index 74bf53c..df2e425 100644
--- a/src/local.c
+++ b/src/local.c
@@ -11,7 +11,7 @@
  *
  * @section DESCRIPTION
  *
- * This is an optional part of linpicker_server that enables a debugging
+ * This is an optional part of linpicker-server that enables a debugging
  * interface over a local socket if the "enable-socket" configure-time option
  * is set (default: disabled).
  *
diff --git a/src/local.h b/src/local.h
index 997b749..1197676 100644
--- a/src/local.h
+++ b/src/local.h
@@ -14,7 +14,7 @@
 #define _LINPICKER_LOCAL_H_
 
 /* The local socket address */
-#define LINPICKER_SOCKNAME "\0linpicker_server"
+#define LINPICKER_SOCKNAME "\0linpicker-server"
 
 /* 1-byte messages accepted over the socket */
 #define LINPICKER_LOCAL_DUMP_VIEWS 0
diff --git a/src/monitor.c b/src/monitor.c
index 4262210..1df3f2e 100644
--- a/src/monitor.c
+++ b/src/monitor.c
@@ -11,7 +11,7 @@
  *
  * @section DESCRIPTION
  *
- * This is the main routine for the linpicker_monitor program.
+ * This is the main routine for the linpicker-monitor program.
  * Nothing much here except initialization, select loop, and teardown.
  */
 
diff --git a/src/server.c b/src/server.c
index 92b3d32..84484a1 100644
--- a/src/server.c
+++ b/src/server.c
@@ -12,7 +12,7 @@
  *
  * @section DESCRIPTION
  *
- * This is the main routine for the linpicker_server program.
+ * This is the main routine for the linpicker-server program.
  * Nothing much here except initialization, select loop, and teardown.
  */
 
diff --git a/src/track.c b/src/track.c
index 039622d..f17ad8a 100644
--- a/src/track.c
+++ b/src/track.c
@@ -26,11 +26,11 @@
  *
  * @section DESCRIPTION
  *
- * This is the linpicker_track program.
+ * This is the linpicker-track program.
  *
  * The Linpicker version of track has been completely rewritten from scratch.
  * The purpose of the program is to keep track of top level X Windows and
- * report their position, size, and visibility to linpicker_server via a
+ * report their position, size, and visibility to linpicker-server via a
  * libvchan connection.
  */
 
diff --git a/src/xen_backend.c b/src/xen_backend.c
index c466072..c8d8712 100644
--- a/src/xen_backend.c
+++ b/src/xen_backend.c
@@ -26,7 +26,7 @@
  * @section DESCRIPTION
  *
  * This is the stock generic backend code from QEMU, modified only slightly.
- * This code is shared between linpicker_monitor and linpicker_server.
+ * This code is shared between linpicker-monitor and linpicker-server.
  */
 
 #include <sys/types.h>
diff --git a/src/xen_backend.h b/src/xen_backend.h
index 09683f5..afca263 100644
--- a/src/xen_backend.h
+++ b/src/xen_backend.h
@@ -26,7 +26,7 @@
  * @section DESCRIPTION
  *
  * This is the stock generic backend code from QEMU, modified only slightly.
- * This code is shared between linpicker_monitor and linpicker_server.
+ * This code is shared between linpicker-monitor and linpicker-server.
  */
 
 #ifndef QEMU_HW_XEN_BACKEND_H
diff --git a/src/xen_linpicker.h b/src/xen_linpicker.h
index 83cbdac..9a6db25 100644
--- a/src/xen_linpicker.h
+++ b/src/xen_linpicker.h
@@ -31,7 +31,7 @@
  * @section DESCRIPTION
  *
  * This is "glue" code between the functions from QEMU and the core
- * linpicker_server or linpicker_monitor code.  The functions prefixed with
+ * linpicker-server or linpicker-monitor code.  The functions prefixed with
  * xen_linpicker_ have differing definitions between server and monitor.
  * This header is shared between both programs.
  */
diff --git a/src/xen_monitor.c b/src/xen_monitor.c
index 83fe1d0..ca576ad 100644
--- a/src/xen_monitor.c
+++ b/src/xen_monitor.c
@@ -13,7 +13,7 @@
  * @section DESCRIPTION
  *
  * This is "glue" code between the functions from QEMU and the core
- * linpicker_monitor code.  The only thing here for linpicker_monitor is the
+ * linpicker-monitor code.  The only thing here for linpicker-monitor is the
  * domain scanning code that listens in XenStore for new domains starting
  * up and handles them (not present in QEMU because each QEMU instance is for
  * a single domain).  In particular the calls to libxenlight to create the
diff --git a/src/xen_server.c b/src/xen_server.c
index 3cc0a2a..a178525 100644
--- a/src/xen_server.c
+++ b/src/xen_server.c
@@ -13,10 +13,10 @@
  * @section DESCRIPTION
  *
  * This is "glue" code between the functions from QEMU and the core
- * linpicker_server code.  There are three main things here:
+ * linpicker-server code.  There are three main things here:
  *
  * 1. Libvchan setup, teardown, and processing code that handles the vchan
- * communications channel from linpicker_track.
+ * communications channel from linpicker-track.
  *
  * 2. Domain scanning code that listens in XenStore for new domains starting
  * up and handles them (not present in QEMU because each QEMU instance is for
diff --git a/src/xenfb_monitor.c b/src/xenfb_monitor.c
index 0fd6ec5..a741477 100644
--- a/src/xenfb_monitor.c
+++ b/src/xenfb_monitor.c
@@ -33,11 +33,11 @@
  * This is the stock framebuffer and input backend code from QEMU,
  * modified to call Linpicker instead of QEMU functions.
  *
- * This is the code for linpicker_monitor, which is responsible for setting
+ * This is the code for linpicker-monitor, which is responsible for setting
  * up the framebuffer and input device backends in XenStore.  This code
  * acutally only handles XenStore writes during frontend state transitions;
  * the initial setup is done using functions from libxenlight.  No actual
- * servicing of the devices are done here, that is linpicker_server's job.
+ * servicing of the devices are done here, that is linpicker-server's job.
  */
 
 #include <sys/types.h>
diff --git a/src/xenfb_server.c b/src/xenfb_server.c
index 8935444..1cff7d2 100644
--- a/src/xenfb_server.c
+++ b/src/xenfb_server.c
@@ -33,8 +33,8 @@
  * This is the stock framebuffer and input backend code from QEMU,
  * modified to call Linpicker instead of QEMU functions.
  *
- * This is the code for linpicker_server, which does not update anything
- * in XenStore (that is the job of linpicker_monitor).  Rather, this code
+ * This is the code for linpicker-server, which does not update anything
+ * in XenStore (that is the job of linpicker-monitor).  Rather, this code
  * is responsible for waiting until the frontend goes to Connected, then
  * mapping the shared pages and framebuffer grant references.  Events are
  * handled here, with framebuffer updates being sent to Linpicker and input