diff options
| -rw-r--r-- | NetWare/Makefile | 8 | ||||
| -rw-r--r-- | NetWare/Nwmain.c | 4 | ||||
| -rw-r--r-- | NetWare/nw5.c | 4 | ||||
| -rw-r--r-- | dosish.h | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/NetWare/Makefile b/NetWare/Makefile index 9e9af9f1d5..d1ae901229 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 9fb2e50845..ce901e6b95 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 66ca348c1e..b217e1cf5f 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); } @@ -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?" */ |