From 3dd457a3054719b5409b46495480efb50387b113 Mon Sep 17 00:00:00 2001 From: Michiel Broek Date: Thu, 18 Mar 2004 19:33:43 +0000 Subject: [PATCH] Code cleanup in execute --- ChangeLog | 2 +- lib/execute.c | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 52124e8a..4affbd0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -96,7 +96,7 @@ v0.51.2 06-Mar-2004 html.nodes and filemgr.status. lang: - removed obsolede prompt 240. + removed obsolete prompt 240. Updated germandu.txt (by Malte Tychsen). diff --git a/lib/execute.c b/lib/execute.c index 82cdf276..6d5e4859 100644 --- a/lib/execute.c +++ b/lib/execute.c @@ -40,7 +40,7 @@ int _execute(char **, char *, char *, char *); int _execute(char **args, char *in, char *out, char *err) { char buf[PATH_MAX]; - int i, pid, terrno = 0, status = 0, rc = 0; + int i, pid, status = 0, rc = 0; memset(&buf, 0, sizeof(buf)); for (i = 0; i < 16; i++) { @@ -86,13 +86,10 @@ int _execute(char **args, char *in, char *out, char *err) errno = 0; if (CFG.priority) { rc = getpriority(PRIO_PROCESS, 0); - Syslog('e', "getpriority in child %d", rc); if (errno == 0) { rc = setpriority(PRIO_PROCESS, 0, CFG.priority); if (rc) WriteError("$execv can't set priority to %d", CFG.priority); - rc = getpriority(PRIO_PROCESS, 0); - Syslog('e', "getpriority in set to %d", rc); } } rc = execv(args[0],args); @@ -107,14 +104,6 @@ int _execute(char **args, char *in, char *out, char *err) e_pid = 0; } while (((rc > 0) && (rc != pid)) || ((rc == -1) && (errno == EINTR))); - terrno = errno; - if (CFG.priority) { - rc = getpriority(PRIO_PROCESS, 0); - Syslog('e', "getpriority in parent %d", rc); - setpriority(PRIO_PROCESS, 0, 0); - } - errno = terrno; - switch (rc) { case -1: /*