projects
/
oweals
/
tinc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
91f65c2
)
Only system() needs script name quoted.
author
Guus Sliepen
<guus@tinc-vpn.org>
Fri, 8 Aug 2003 22:45:46 +0000
(22:45 +0000)
committer
Guus Sliepen
<guus@tinc-vpn.org>
Fri, 8 Aug 2003 22:45:46 +0000
(22:45 +0000)
src/process.c
patch
|
blob
|
history
diff --git
a/src/process.c
b/src/process.c
index 0ec98802342f531463c328909fa5520ab3dd4d48..1a8592d3bed8bf8a828269acc605203e91c17e1a 100644
(file)
--- a/
src/process.c
+++ b/
src/process.c
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: process.c,v 1.1.2.
69 2003/08/08 22:11:54
guus Exp $
+ $Id: process.c,v 1.1.2.
70 2003/08/08 22:45:46
guus Exp $
*/
#include "system.h"
*/
#include "system.h"
@@
-365,15
+365,17
@@
bool execute_script(const char *name, char **envp)
cp();
cp();
- asprintf(&scriptname, "\"%s/%s\"", confbase, name);
-
#ifndef HAVE_MINGW
#ifndef HAVE_MINGW
+ asprintf(&scriptname, "%s/%s", confbase, name);
+
/* First check if there is a script */
if(stat(scriptname, &s))
return true;
ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name);
/* First check if there is a script */
if(stat(scriptname, &s))
return true;
ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name);
+
+ free(scriptname);
#endif
#ifdef HAVE_PUTENV
#endif
#ifdef HAVE_PUTENV
@@
-383,6
+385,7
@@
bool execute_script(const char *name, char **envp)
putenv(*envp++);
#endif
putenv(*envp++);
#endif
+ asprintf(&scriptname, "\"%s/%s\"", confbase, name);
status = system(scriptname);
free(scriptname);
status = system(scriptname);
free(scriptname);