{
char *av[5];
int ac = 0;
- char *command2 = (char *) malloc (strlen (command) + 6);
- memcpy (command2, "exec ", 5);
- memcpy (command2 + 5, command, strlen (command) + 1);
+ char *command2 = (char *) malloc (strlen (command) + 10);
+ const char *s;
+ int got_eq = 0;
+ const char *after_vars;
+
+ /* Skip leading whitespace.
+ */
+ while (*command == ' ' || *command == '\t')
+ command++;
+
+ /* If the string has a series of tokens with "=" in them at them, set
+ `after_vars' to point into the string after those tokens and any
+ trailing whitespace. Otherwise, after_vars == command.
+ */
+ after_vars = command;
+ for (s = command; *s; s++)
+ {
+ if (*s == '=') got_eq = 1;
+ else if (*s == ' ')
+ {
+ if (got_eq)
+ {
+ while (*s == ' ' || *s == '\t')
+ s++;
+ after_vars = s;
+ got_eq = 0;
+ }
+ else
+ break;
+ }
+ }
+
+ *command2 = 0;
+ strncat (command2, command, after_vars - command);
+ strcat (command2, "exec ");
+ strcat (command2, after_vars);
+
+ /* We have now done these transformations:
+ "foo -x -y" ==> "exec foo -x -y"
+ "BLAT=foop foo -x" ==> "BLAT=foop exec foo -x"
+ "BLAT=foop A=b foo -x" ==> "BLAT=foop A=b exec foo -x"
+ */
+
/* Invoke the shell as "/bin/sh -c 'exec prog -arg -arg ...'" */
av [ac++] = (char *) shell;
Bool hairy_p = !!strpbrk (command, "*?$&!<>[];`'\\\"=");
/* note: = is in the above because of the sh syntax "FOO=bar cmd". */
+ if (getuid() == (uid_t) 0 || geteuid() == (uid_t) 0)
+ {
+ /* If you're thinking of commenting this out, think again.
+ If you do so, you will open a security hole. Mail jwz
+ so that he may enlighten you as to the error of your ways.
+ */
+ fprintf (stderr, "%s: we're still running as root! Disaster!\n",
+ blurb());
+ saver_exit (si, 1, 0);
+ }
+
if (p->verbose_p)
fprintf (stderr, "%s: spawning \"%s\" in pid %lu%s.\n",
blurb(), command, (unsigned long) getpid (),
static char name [1024];
const char *in = cmd;
char *out = name;
+ int got_eq = 0;
+ int first = 1;
clean_job_list();
+ AGAIN:
while (isspace(*in)) in++; /* skip whitespace */
- while (!isspace(*in) && *in != ':')
+ while (!isspace(*in) && *in != ':') {
+ if (*in == '=') got_eq = 1;
*out++ = *in++; /* snarf first token */
+ }
+
+ if (got_eq) /* if the first token was FOO=bar */
+ { /* then get the next token instead. */
+ got_eq = 0;
+ out = name;
+ first = 0;
+ goto AGAIN;
+ }
+
while (isspace(*in)) in++; /* skip whitespace */
- if (*in == ':') /* token was a visual name; skip it. */
+ if (first && *in == ':') /* token was a visual name; skip it. */
{
- in++;
out = name;
- while (isspace(*in)) in++; /* skip whitespace */
- while (!isspace(*in)) *out++ = *in++; /* snarf first token */
+ first = 0;
+ goto AGAIN;
}
*out = 0;
\f
static Bool
-hack_enabled_p (const char *hack)
-{
- const char *s = hack;
- while (isspace(*s)) s++;
- return (*s != '-');
-}
-
-static Bool
-select_visual_of_hack (saver_screen_info *ssi, const char *hack)
+select_visual_of_hack (saver_screen_info *ssi, screenhack *hack)
{
saver_info *si = ssi->global;
saver_preferences *p = &si->prefs;
Bool selected;
- static char vis [1024];
- const char *in = hack;
- char *out = vis;
- while (isspace(*in)) in++; /* skip whitespace */
- if (*in == '-') in++; /* skip optional "-" */
- while (isspace(*in)) in++; /* skip whitespace */
-
- while (!isspace(*in) && *in != ':')
- *out++ = *in++; /* snarf first token */
- while (isspace(*in)) in++; /* skip whitespace */
- *out = 0;
- if (*in == ':')
- selected = select_visual(ssi, vis);
+ if (hack->visual && *hack->visual == ':')
+ selected = select_visual(ssi, hack->visual);
else
selected = select_visual(ssi, 0);
if (!selected && (p->verbose_p || si->demoing_p))
- {
- if (*in == ':') in++;
- while (isspace(*in)) in++;
- fprintf (stderr,
- (si->demoing_p
- ? "%s: warning, no \"%s\" visual for \"%s\".\n"
- : "%s: no \"%s\" visual; skipping \"%s\".\n"),
- blurb(), (*vis ? vis : "???"), in);
- }
+ fprintf (stderr,
+ (si->demoing_p
+ ? "%s: warning, no \"%s\" visual for \"%s\".\n"
+ : "%s: no \"%s\" visual; skipping \"%s\".\n"),
+ blurb(),
+ (hack->visual && *hack->visual ? hack->visual : "???"),
+ hack->command);
return selected;
}
if (p->screenhacks_count)
{
- char *hack;
+ screenhack *hack;
pid_t forked;
char buf [255];
int new_hack;
select_visual_of_hack (ssi, hack);
if (!force &&
- (!hack_enabled_p (hack) ||
+ (!hack->enabled_p ||
!select_visual_of_hack (ssi, hack)))
{
if (++retry_count > (p->screenhacks_count*4))
if (si->selection_mode < 0)
si->selection_mode = 0;
-
- /* If there's a visual description on the front of the command, nuke it.
- */
- {
- char *in = hack;
- while (isspace(*in)) in++; /* skip whitespace */
- if (*in == '-') in++; /* skip optional "-" */
- while (isspace(*in)) in++; /* skip whitespace */
- hack = in;
- while (!isspace(*in) && *in != ':') in++; /* snarf first token */
- while (isspace(*in)) in++; /* skip whitespace */
- if (*in == ':')
- {
- in++;
- while (isspace(*in)) in++;
- hack = in;
- }
- }
-
switch ((int) (forked = fork ()))
{
case -1:
close (ConnectionNumber (si->dpy)); /* close display fd */
nice_subproc (p->nice_inferior); /* change process priority */
hack_subproc_environment (ssi); /* set $DISPLAY */
- exec_screenhack (si, hack); /* this does not return */
+ exec_screenhack (si, hack->command); /* this does not return */
abort();
break;
default:
ssi->pid = forked;
- (void) make_job (forked, hack);
+ (void) make_job (forked, hack->command);
break;
}
}
void
spawn_screenhack (saver_info *si, Bool first_time_p)
{
- int i;
-
- if (!monitor_powered_on_p (si))
+ if (monitor_powered_on_p (si))
{
- if (si->prefs.verbose_p)
- fprintf (stderr,
- "%s: server reports that monitor has powered down; "
- "not launching a new hack.\n", blurb());
- return;
+ int i;
+ for (i = 0; i < si->nscreens; i++)
+ {
+ saver_screen_info *ssi = &si->screens[i];
+ spawn_screenhack_1 (ssi, first_time_p);
+ }
}
+ else if (si->prefs.verbose_p)
+ fprintf (stderr,
+ "%s: server reports that monitor has powered down; "
+ "not launching a new hack.\n", blurb());
- for (i = 0; i < si->nscreens; i++)
- {
- saver_screen_info *ssi = &si->screens[i];
- spawn_screenhack_1 (ssi, first_time_p);
- }
+ store_saver_status (si); /* store current hack numbers */
}
projects / xscreensaver / blobdiff