kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: Implemented SetWorkingDirectory method.

Browse Source
This commit is contained in:
Brad King 2003-07-07 09:12:34 -04:00
parent 2b8bfb3b5d
commit b5fec4a3c8
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/kwsys/Process.h.in
View File

@ -99,10 +99,11 @@ kwsysEXPORT void kwsysProcess_SetCommand(kwsysProcess* cp,
kwsysEXPORT void kwsysProcess_SetTimeout(kwsysProcess* cp, double timeout); kwsysEXPORT void kwsysProcess_SetTimeout(kwsysProcess* cp, double timeout);
/** /**
* Set the working directory for the child process. The working directory can * Set the working directory for the child process. The working
* be absolute or relative to the current directory. * directory can be absolute or relative to the current directory.
*/ */
kwsysEXPORT void kwsysProcess_SetWorkingDirectory(kwsysProcess* cp, const char* dir); kwsysEXPORT void kwsysProcess_SetWorkingDirectory(kwsysProcess* cp,
const char* dir);
/** /**
* Get the current state of the Process instance. Possible states are: * Get the current state of the Process instance. Possible states are:

17
Source/kwsys/ProcessUNIX.c
View File

@ -167,6 +167,7 @@ void kwsysProcess_Delete(kwsysProcess* cp)
/* Free memory. */ /* Free memory. */
kwsysProcess_SetCommand(cp, 0); kwsysProcess_SetCommand(cp, 0);
kwsysProcess_SetWorkingDirectory(cp, 0);
free(cp); free(cp);
} }
@ -227,7 +228,7 @@ void kwsysProcess_SetWorkingDirectory(kwsysProcess* cp, const char* dir)
} }
if(dir) if(dir)
{ {
cp->WorkingDirectory = (char*) malloc(strlen(dir) + 1); cp->WorkingDirectory = (char*)malloc(strlen(dir) + 1);
strcpy(cp->WorkingDirectory, dir); strcpy(cp->WorkingDirectory, dir);
} }
} }
@ -345,6 +346,20 @@ void kwsysProcess_Execute(kwsysProcess* cp)
/* Restore all default signal handlers. */ /* Restore all default signal handlers. */
kwsysProcessRestoreDefaultSignalHandlers(); kwsysProcessRestoreDefaultSignalHandlers();
/* Change to the working directory specified, if any. */
if(cp->WorkingDirectory)
{
/* Some platforms specify that the chdir call may be
interrupted. Repeat the call until it finishes. */
int r;
while(((r = chdir(cp->WorkingDirectory)) < 0) && (errno == EINTR));
if(r < 0)
{
/* Failure. Report error to parent and terminate. */
kwsysProcessChildErrorExit(cp);
}
}
/* Execute the real process. If successful, this does not return. */ /* Execute the real process. If successful, this does not return. */
execvp(cp->Command[0], cp->Command); execvp(cp->Command[0], cp->Command);