From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Fri, 5 Apr 2002 13:42:29 +0000 (+0000)
Subject: NetWare update from C Aditya.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=728c2768590668c35dbcf237cec2e10d42c4cf41;p=p5sagit%2Fp5-mst-13.2.git

NetWare update from C Aditya.

p4raw-id: //depot/perl@15747
---

diff --git a/NetWare/Makefile b/NetWare/Makefile
index 9e9af9f..d1ae901 100644
--- a/NetWare/Makefile
+++ b/NetWare/Makefile
@@ -942,7 +942,7 @@ $(EXTDIR)\DynaLoader\dl_netware.xs: dl_netware.xs
 
 HEADERS :
 	@echo . . . . making stdio.h and string.h
-	@copy << stdio.h >\nul
+	@copy << stdio.h >\nwnul
 
 /*
  * (C) Copyright 2001-2002 Novell Inc. All rights reserved.
@@ -979,7 +979,7 @@ HEADERS :
 <<
 	@copy stdio.h $(COREDIR)
 	 
-	@copy << string.h >\nul
+	@copy << string.h >\nwnul
 
 /*
  * (C) Copyright 2001-2002 Novell Inc. All rights reserved.
@@ -1017,7 +1017,7 @@ HEADERS :
 	@copy string.h $(COREDIR)
 
 
-$(NLM_NAME): MESSAGE HEADERS $(BLDDIR)\nul $(NLM_OBJ) $(NEWTARE_OBJ_DEP) $(PERL_IO_OBJ_DEP) $(PERL_LIB_OBJ_DEP) $(DLL_OBJ) .XDC $(PERLIMPLIB) $(EXT_MAIN_OBJ)
+$(NLM_NAME): MESSAGE HEADERS $(BLDDIR)\nwnul $(NLM_OBJ) $(NEWTARE_OBJ_DEP) $(PERL_IO_OBJ_DEP) $(PERL_LIB_OBJ_DEP) $(DLL_OBJ) .XDC $(PERLIMPLIB) $(EXT_MAIN_OBJ)
 	@echo======= Linking $@ at $(MAKEDIR)\$(BLDDIR) =======
 !ifdef WATCOM
 	@$(NLM_LINK) @<<$(BLDDIR)\$*.link
@@ -1078,7 +1078,7 @@ Import @perl.imp
 	@echo======= Finished building $(BUILT).
  
 # Create the debug\release directory if not existing
-$(BLDDIR)\nul:
+$(BLDDIR)\nwnul:
 	@echo . . . . mkdir $(BLDDIR)
 	@mkdir $(BLDDIR)
 
diff --git a/NetWare/Nwmain.c b/NetWare/Nwmain.c
index 9fb2e50..ce901e6 100644
--- a/NetWare/Nwmain.c
+++ b/NetWare/Nwmain.c
@@ -177,7 +177,7 @@ void main(int argc, char *argv[])
 		char sNUL[MAX_DN_BYTES] = {'\0'};
 
 		strcpy(sNUL, NWDEFPERLROOT);
-		strcat(sNUL, "\\nul");
+		strcat(sNUL, "\\nwnul");
 		if (access((const char *)sNUL, 0) != 0)
 		{
 			// The file, "nul" is not found and so create the file.
@@ -309,7 +309,7 @@ void fnSigTermHandler(int sig)
 		char sNUL[MAX_DN_BYTES] = {'\0'};
 
 		strcpy(sNUL, NWDEFPERLROOT);
-		strcat(sNUL, "\\nul");
+		strcat(sNUL, "\\nwnul");
 		if (access((const char *)sNUL, 0) == 0)
 		{
 			// The file, "nul" is found and so delete it.
diff --git a/NetWare/nw5.c b/NetWare/nw5.c
index 66ca348..b217e1c 100644
--- a/NetWare/nw5.c
+++ b/NetWare/nw5.c
@@ -581,8 +581,8 @@ nw_open(const char *path, int flag, ...)
     pmode = va_arg(ap, int);
     va_end(ap);
 
-	if (stricmp(path, "/dev/null")==0)
-	path = "NUL";
+	if (stricmp(path, "/dev/nul")==0)
+	path = "NWNUL";
 
 	return open(path, flag, pmode);
 }
diff --git a/dosish.h b/dosish.h
index 634efa7..c933597 100644
--- a/dosish.h
+++ b/dosish.h
@@ -37,7 +37,7 @@
 #  else
 #	 ifdef NETWARE
 #      define PERL_SYS_INIT(c,v)	Perl_nw5_init(c,v)
-#      define BIT_BUCKET "nul"
+#      define BIT_BUCKET "nwnul"
 #    else
 #      define PERL_SYS_INIT(c,v)
 #      define BIT_BUCKET "\\dev\\nul" /* "wanna be like, umm, Newlined, or somethin?" */