X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=NetWare%2FNWUtil.c;h=f23774a66885f5a5132e41f03df13e8e3151d044;hb=ac49b0251b62a2ed1e5f0e17d1c256ce3f88d6dd;hp=9cc5b5c629394565ec54029e26200b41f6a77781;hpb=2986a63f7e513cf37f46db9f211b77071260031f;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/NetWare/NWUtil.c b/NetWare/NWUtil.c
index 9cc5b5c..f23774a 100644
--- a/NetWare/NWUtil.c
+++ b/NetWare/NWUtil.c
@@ -472,15 +472,16 @@ void fnAppendArgument(PCOMMANDLINEPARSER pclp, char *new_arg)
 	strcpy(pclp->m_argv[pclp->m_argc], new_arg);	// Appended the new argument.
 	pclp->m_argc++;		// Increment the number of parameters appended.
 
-	// The char array is emptied for all elements upto the end so that there are no junk characters.
-	// If this is not done, then the issue is like this:
+	// The char array is emptied for all elements upto the end so that there are no
+	// junk characters. If this is not done, then the issue is like this:
 	// - Simple perl command like "perl" on the system console works fine for the first time.
-	// - When it is given the second time, a new blank screen should come up which also
-	//   allows for editing. This was not consistently working well.
-	//   More so when the command was like, "perl   ", that is the name "perl"
-	//   followed by a few blank spaces. It used to give error in opening file and
-	//   would give some junk as the filename unable to open.
-	// Once the below fix was done, it is working fine.
+	// - When "perl" is executed the second time, a new blank screen should come up
+	//   which allows for editing also. This was not consistently working well.
+	//   More so when the command was like, "perl   ", that is the name "perl" followed
+	//   by a few blank spaces, it used to give error in opening file:
+	//   "unable to open the file" since the filename would have some junk characters.
+	// 
+	// These issues are fixed through the code below.
 	for(i=pclp->m_argc; i<pclp->m_argv_len; i++)
 		strncpy(pclp->m_argv[i], "", (MAX_DN_BYTES * sizeof(char)));	// MAX_DN_BYTES is the size of pclp->m_argv[].
 
@@ -735,6 +736,7 @@ char* fnMy_MkTemp(char* templatestr)
 
 	char termchar = '\0';
 	char letter = 'a';
+	char letter1 = 'a';
 
 
 	if (templatestr && (pXs = strstr(templatestr, (char *)"XXXXXX")))
@@ -753,6 +755,19 @@ char* fnMy_MkTemp(char* templatestr)
 		else
 			pPid = numbuf;
 
+/**
+		Backtick operation uses temp files that are stored under NWDEFPERLTEMP
+		directory. They are temporarily used and then cleaned up after usage.
+		In cases where multiple backtick operations are used that call some
+		complex scripts, new temp files will be created before the old ones are
+		deleted. So, we need to have a provision to create many temp files.
+		Hence the below logic. It is found that provision for 26 files may
+		not be enough in some cases.
+
+		This below logic allows 26 files (like, pla00015.tmp through plz00015.tmp)
+		plus 6x26=676 (like, plaa0015.tmp through plzz0015.tmp)
+**/
+
 		letter = 'a';
 		do
 		{
@@ -765,6 +780,23 @@ char* fnMy_MkTemp(char* templatestr)
 			letter++;
 		} while (letter <= 'z');
 
+		letter1 = 'a';
+		do
+		{
+			letter = 'a';
+			do
+			{
+				sprintf(pXs, (char *)"%c%c%04.5s", letter1, letter, pPid);
+				pXs[6] = termchar;
+				if (access(templatestr, 0) != 0)	// File does not exist
+				{
+					return templatestr;
+				}
+				letter++;
+			} while (letter <= 'z');
+			letter1++;
+		} while (letter1 <= 'z');
+
 		errno = ENOENT;
 		return NULL;
 	}