j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

stat() batch files under Windows.

Browse source
This commit is contained in:
Guus Sliepen 2003-08-16 12:11:11 +00:00
parent 03995ca52e
commit fd40130eb6
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/process.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: process.c,v 1.1.2.71 2003/08/10 13:35:05 guus Exp $ $Id: process.c,v 1.1.2.72 2003/08/16 12:11:11 guus Exp $
*/ */
#include "system.h" #include "system.h"
@ -93,12 +93,17 @@ bool install_service(void) {
return false; return false;
} }
strncat(command, "\"", sizeof(command));
if(!strchr(program_name, '\\')) { if(!strchr(program_name, '\\')) {
GetCurrentDirectory(sizeof(command), command); GetCurrentDirectory(sizeof(command), command);
strncat(command, "\\", sizeof(command)); strncat(command, "\\", sizeof(command));
} }
strncat(command, program_name, sizeof(command)); strncat(command, program_name, sizeof(command));
strncat(command, "\"", sizeof(command));
for(argp = g_argv + 1; *argp; argp++) { for(argp = g_argv + 1; *argp; argp++) {
space = strchr(*argp, ' '); space = strchr(*argp, ' ');
strncat(command, " ", sizeof(command)); strncat(command, " ", sizeof(command));
@ -362,25 +367,29 @@ bool detach(void)
bool execute_script(const char *name, char **envp) bool execute_script(const char *name, char **envp)
{ {
#ifdef HAVE_SYSTEM #ifdef HAVE_SYSTEM
int status; int status, len;
struct stat s; struct stat s;
char *scriptname; char *scriptname;
cp(); cp();
#ifndef HAVE_MINGW #ifndef HAVE_MINGW
asprintf(&scriptname, "%s/%s", confbase, name); len = asprintf(&scriptname, "\"%s/%s\"", confbase, name);
#else
len = asprintf(&scriptname, "\"%s/%s.bat\"", confbase, name);
#endif
if(len < 0)
return false;
scriptname[len - 1] = '\0';
/* First check if there is a script */ /* First check if there is a script */
if(stat(scriptname, &s)) if(stat(scriptname + 1, &s))
return true; return true;
ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name); ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name);
free(scriptname);
#endif
#ifdef HAVE_PUTENV #ifdef HAVE_PUTENV
/* Set environment */ /* Set environment */
@ -388,7 +397,7 @@ bool execute_script(const char *name, char **envp)
putenv(*envp++); putenv(*envp++);
#endif #endif
asprintf(&scriptname, "\"%s/%s\"", confbase, name); scriptname[len - 1] = '\"';
status = system(scriptname); status = system(scriptname);
free(scriptname); free(scriptname);