lin-epics-modules/require
0
0
Fork 0
forked from epics_driver_modules/require
Code Pull Requests Activity

fix checking of absolute paths on windows

Browse Source
This commit is contained in:
Xiaoqiang Wang
2019-12-13 08:33:03 +01:00
parent 66c805e7f1
commit 2c7cbed8fb
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runScript.c
+19 -3
View File
@@ -45,8 +45,6 @@ epicsShareFunc int epicsShareAPI iocshCmd(const char *cmd);
#include <epicsExport.h>
#endif
#define IS_ABS_PATH(filename) (filename[0] == OSI_PATH_SEPARATOR[0]) /* may be different for other OS ? */
#include "expr.h"
#include "require.h"
@@ -55,6 +53,24 @@ epicsShareFunc int epicsShareAPI iocshCmd(const char *cmd);
int runScriptDebug=0;
int isAbsPath(const char* filename)
{
#ifdef _WIN32
/* network path, e.g. "\\x03ma\gac-x03ma\Data1" */
if (strncmp(filename, "\\\\", 2) == 0)
return 1;
/* driver letter, e.g. "C:\Temp" */
else if (strlen(filename) > 3
&& ((filename[0]>='a'&&filename[0]<='z') || (filename[0]>='A'&&filename[0]<='Z'))
&& strncmp(filename+1, ":\\", 2) == 0)
return 1;
else
return 0;
#else
return filename[0] == OSI_PATH_SEPARATOR[0] ? 1 : 0;
#endif
}
int runScript(const char* filename, const char* args)
{
MAC_HANDLE *mac = NULL;
@@ -134,7 +150,7 @@ int runScript(const char* filename, const char* args)
free(pairs);
}
if (IS_ABS_PATH(filename))
if (isAbsPath(filename))
{
file = fopen(filename, "r");
}