cleanup argv passing to notification program

[wall-notify/wall-notify.git] / src / wall-notify.c

diff --git a/src/wall-notify.c b/src/wall-notify.c
index dd37e897a03ccea27adb731e0466fea59b232f6f..7fb3b33cbc0bdaaf2e7436abf77bd7ca4b8d4fa1 100644 (file)
--- a/src/wall-notify.c
+++ b/src/wall-notify.c
@@ -205,9 +205,6 @@ static void pass_buffer_to_program(const char *buffer, size_t length, char **arg
 
     pid_t pid;
 
-    /* Skip argv[0]. */
-    argv++;
-
     if (pipe(fds) != 0) {
         perror("pipe");
         return;
@@ -294,14 +291,23 @@ static void handle_wall(int fd, char **argv) {
     }
 }
 
+static void usage(const char *argv0) {
+    fprintf(stderr, "usage: %s <cmd args..>\n", argv0);
+    exit(EXIT_FAILURE);
+}
+
 
 int main(int argc, char **argv) {
     int ptm, pts;
     char *name;
+    const char *argv0;
+
+    argv0 = argv[0];
+    /* Don't pass our argv[0] to the notification program. */
+    argv++;
 
     if (argc < 2) {
-        fprintf(stderr, "usage: %s <cmd args..>\n", argv[0]);
-        exit(EXIT_FAILURE);
+        usage(argv0);
     }
 
     ptm = open_tty();