diff options
| -rw-r--r-- | calmwm.c | 7 | ||||
| -rw-r--r-- | util.c | 4 |
2 files changed, 8 insertions, 3 deletions
@@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: calmwm.c,v 1.105 2017/12/27 18:46:18 okan Exp $ + * $OpenBSD: calmwm.c,v 1.106 2017/12/29 20:09:19 okan Exp $ */ #include <sys/types.h> @@ -56,6 +56,7 @@ main(int argc, char **argv) { const char *conf_file = NULL; char *conf_path, *display_name = NULL; + char *fallback; int ch, xfd; struct pollfd pfd[1]; struct passwd *pw; @@ -64,6 +65,7 @@ main(int argc, char **argv) warnx("no locale support"); mbtowc(NULL, NULL, MB_CUR_MAX); + fallback = u_argv(argv); Conf.wm_argv = u_argv(argv); while ((ch = getopt(argc, argv, "c:d:")) != -1) { switch (ch) { @@ -132,6 +134,9 @@ main(int argc, char **argv) if (cwm_status == CWM_EXEC_WM) u_exec(Conf.wm_argv); + warnx("'%s' failed to start, restarting fallback", Conf.wm_argv); + u_exec(fallback); + return(0); } @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: util.c,v 1.18 2015/09/16 17:58:25 okan Exp $ + * $OpenBSD: util.c,v 1.19 2017/12/29 20:09:19 okan Exp $ */ #include <sys/types.h> @@ -78,7 +78,7 @@ u_exec(char *argstr) (void)setsid(); (void)execvp(args[0], args); - err(1, "%s", s); + warn("%s", s); } char * |