d6b2d66ae6
u_exec, but the introduction of re-exec'ing the previous invocation of cwm if 'exec_wm' failed missed the 'exec' failing path. Will likely split out as a proper fix. Odd behaviour reported by Ve Telko.
107 lines
2.2 KiB
C
107 lines
2.2 KiB
C
/*
|
|
* calmwm - the calm window manager
|
|
*
|
|
* Copyright (c) 2004 Marius Aamodt Eriksen <marius@monkey.org>
|
|
*
|
|
* Permission to use, copy, modify, and distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
* 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.20 2018/01/08 16:21:54 okan Exp $
|
|
*/
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/queue.h>
|
|
|
|
#include <err.h>
|
|
#include <errno.h>
|
|
#include <limits.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
|
|
#include "calmwm.h"
|
|
|
|
void
|
|
u_spawn(char *argstr)
|
|
{
|
|
switch (fork()) {
|
|
case 0:
|
|
u_exec(argstr);
|
|
exit(1);
|
|
case -1:
|
|
warn("fork");
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
void
|
|
u_exec(char *argstr)
|
|
{
|
|
#define MAXARGLEN 20
|
|
char *args[MAXARGLEN], **ap = args;
|
|
char **end = &args[MAXARGLEN - 1], *tmp;
|
|
char *s = argstr;
|
|
|
|
while (ap < end && (*ap = strsep(&argstr, " \t")) != NULL) {
|
|
if (**ap == '\0')
|
|
continue;
|
|
ap++;
|
|
if (argstr != NULL) {
|
|
/* deal with quoted strings */
|
|
switch(argstr[0]) {
|
|
case '"':
|
|
case '\'':
|
|
if ((tmp = strchr(argstr + 1, argstr[0]))
|
|
!= NULL) {
|
|
*(tmp++) = '\0';
|
|
*(ap++) = ++argstr;
|
|
argstr = tmp;
|
|
}
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
*ap = NULL;
|
|
|
|
(void)setsid();
|
|
(void)execvp(args[0], args);
|
|
warn("%s", s);
|
|
}
|
|
|
|
char *
|
|
u_argv(char * const *argv)
|
|
{
|
|
size_t siz = 0;
|
|
int i;
|
|
char *p;
|
|
|
|
if (argv == 0)
|
|
return(NULL);
|
|
|
|
for (i = 0; argv[i]; i++)
|
|
siz += strlen(argv[i]) + 1;
|
|
if (siz == 0)
|
|
return(NULL);
|
|
|
|
p = xmalloc(siz);
|
|
strlcpy(p, argv[0], siz);
|
|
for (i = 1; argv[i]; i++) {
|
|
strlcat(p, " ", siz);
|
|
strlcat(p, argv[i], siz);
|
|
}
|
|
return(p);
|
|
}
|