add strict ansi compliance

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 268d4e6d8242431758a0e6aee59348a5cb4972fe..04e07ab628fc1e8d73e70e2d30fbcfced47234bc 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -19,9 +19,6 @@
 #ifdef HAVE_FCNTL_H
 #  include <fcntl.h>
 #endif
-#ifdef HAVE_SYS_SELECT_H
-#  include <sys/select.h>
-#endif
 #ifdef HAVE_SIGNAL_H
 #  include <signal.h>
 #endif
@@ -78,7 +75,7 @@ int main(int argc, char **argv)
     sigemptyset(&sigset);
     action.sa_handler = dispatch_signal;
     action.sa_mask = sigset;
-    action.sa_flags = SA_NOCLDSTOP | SA_NODEFER;
+    action.sa_flags = SA_NOCLDSTOP;
     sigaction(SIGUSR1, &action, (struct sigaction *) NULL);
     sigaction(SIGPIPE, &action, (struct sigaction *) NULL);
     sigaction(SIGSEGV, &action, (struct sigaction *) NULL);
@@ -150,6 +147,8 @@ int main(int argc, char **argv)
         plugin_open("focus");
         plugin_open("keyboard");
         plugin_open("mouse");
+        plugin_open("placement");
+        plugin_open("resistance");
 
        /* get all the existing windows */
        client_manage_all();
@@ -178,7 +177,6 @@ int main(int argc, char **argv)
     XCloseDisplay(ob_display);
 
     if (ob_restart) {
-        ob_restart_path = "";
         if (ob_restart_path != NULL) {
             int argcp;
             char **argvp;
@@ -270,6 +268,10 @@ void parse_args(int argc, char **argv)
                 g_printerr("-rc requires an argument\n");
             else
                 ob_rc_path = argv[++i];
+        } else {
+            g_printerr("Invalid option: '%s'\n\n", argv[i]);
+            print_help();
+            exit(1);
         }
     }
 }