enc2xs template -- searches script more sensibly

[p5sagit/p5-mst-13.2.git] / NetWare / Nwmain.c

diff --git a/NetWare/Nwmain.c b/NetWare/Nwmain.c
index a01fa5e..219ab6c 100644 (file)
--- a/NetWare/Nwmain.c
+++ b/NetWare/Nwmain.c
@@ -119,7 +119,11 @@ int fnFpSetMode(FILE* fp, int mode, int *err);
 
 void fnGetPerlScreenName(char *sPerlScreenName);
 
-
+void fnGetPerlScreenName(char *sPerlScreenName);
+void fnSetupNamespace(void); 
+char *getcwd(char [], int); 
+void fnRunScript(ScriptData* psdata);
+void nw_freeenviron();
 
 
 /*============================================================================================
@@ -160,8 +164,8 @@ void main(int argc, char *argv[])
 
 //     Ensure that we have a "temp" directory
        fnSetupNamespace();
-       if (access(DEFTEMP, 0) != 0)
-               mkdir(DEFTEMP);
+       if (access(NWDEFPERLTEMP, 0) != 0)
+               mkdir(NWDEFPERLTEMP);
 
        // Create the file NUL if not present. This is done only once per NLM load.
        // This is required for -e.
@@ -176,8 +180,8 @@ void main(int argc, char *argv[])
        {
                char sNUL[MAX_DN_BYTES] = {'\0'};
 
-               strcpy(sNUL, DEFPERLROOT);
-               strcat(sNUL, "\\nul");
+               strcpy(sNUL, NWDEFPERLROOT);
+               strcat(sNUL, "\\nwnul");
                if (access((const char *)sNUL, 0) != 0)
                {
                        // The file, "nul" is not found and so create the file.
@@ -299,7 +303,7 @@ void fnSigTermHandler(int sig)
                //
                while (!fnTerminateThreadInfo() && k < 5)
                {
-                       sleep(1);
+                       nw_sleep(1);
                        k++;
                }
        }
@@ -308,8 +312,8 @@ void fnSigTermHandler(int sig)
        {
                char sNUL[MAX_DN_BYTES] = {'\0'};
 
-               strcpy(sNUL, DEFPERLROOT);
-               strcat(sNUL, "\\nul");
+               strcpy(sNUL, NWDEFPERLROOT);
+               strcat(sNUL, "\\nwnul");
                if (access((const char *)sNUL, 0) == 0)
                {
                        // The file, "nul" is found and so delete it.
@@ -530,7 +534,7 @@ void fnLaunchPerl(void* context)
        {
                // get the default working directory name
                //
-               defaultDir = fnNwGetEnvironmentStr("PERL_ROOT", DEFPERLROOT);
+               defaultDir = fnNwGetEnvironmentStr("PERL_ROOT", NWDEFPERLROOT);
        }
        else
                defaultDir = getcwd(curdir, sizeof(curdir)-1);
@@ -1386,10 +1390,8 @@ char ***
 nw_getenviron()
 {
        if (genviron)
-               // This (and not the next line) is the correct operation since it matches with the return type.
-               // But it is leaking memory upto 11736 bytes!!  So it is commented.
-//             return (&genviron);
-               return genviron;
+               return (&genviron);     // This might leak memory upto 11736 bytes on some versions of NetWare.
+//             return genviron;        // Abending on some versions of NetWare.
        else
                fnSetUpEnvBlock(&genviron);