NetWare update from Ananth Kesari.

p4raw-id: //depot/perl@12913

diff --git a/NetWare/Makefile b/NetWare/Makefile
index ff879e9..6fde4d6 100644 (file)
--- a/NetWare/Makefile
+++ b/NetWare/Makefile
@@ -273,6 +273,7 @@ RE_NLP                      = $(AUTODIR)\re\re.nlp
 BYTELOADER_NLP         = $(AUTODIR)\ByteLoader\ByteLoader.nlp
 DPROF_NLP              = $(AUTODIR)\Devel\DProf\DProf.nlp
 GLOB_NLP               = $(AUTODIR)\File\Glob\Glob.nlp
+HOSTNAME_NLP           = $(AUTODIR)\Sys\Hostname\Hostname.nlp
 CWD_NLP                        = $(AUTODIR)\Cwd\Cwd.nlp
 STORABLE_NLP           = $(AUTODIR)\Storable\Storable.nlp
 LISTUTIL_NLP           = $(AUTODIR)\List\Util\Util.nlp
@@ -280,7 +281,7 @@ MIMEBASE64_NLP              = $(AUTODIR)\MIME\Base64\Base64.nlp
 XSTYPEMAP_NLP          = $(AUTODIR)\XS\Typemap\Typemap.nlp
 UNICODENORMALIZE_NLP   = $(AUTODIR)\XS\Typemap\Typemap.nlp
 
-EXTENSION_NLP  =               \
+EXTENSION_NLP  =               \
                $(FCNTL_NLP)    \
                $(BYTELOADER_NLP)       \
                $(IO_NLP)               \
@@ -296,6 +297,7 @@ EXTENSION_NLP       =               \
                $(PEEK_NLP)             \
                $(RE_NLP)       \
                $(DPROF_NLP)    \
+               $(HOSTNAME_NLP) \
                $(STORABLE_NLP) \
                $(LISTUTIL_NLP) \
                $(MIMEBASE64_NLP) \
@@ -329,11 +331,6 @@ TEST_NLMS  =       \
                        $(ECHO_NLM)     \
                        $(TYPE_NLM)     \
 
-ERRNO_PM_NW    = $(LIBDIR)\Errno.pm
-
-EXTENSION_NPM =        \
-               $(ERRNO_PM_NW)  \
-
 
 !ifndef SCREEN
 SCREEN          = 'none'
@@ -767,7 +764,8 @@ X2P_OBJ             = $(X2P_SRC:.c=.obj)
 DYNAMIC_EXT    = Socket IO Fcntl Opcode SDBM_File POSIX attrs Thread B re \
                Data/Dumper Devel/Peek ByteLoader Devel/DProf File/Glob \
                Storable/Storable List/Util MIME/Base64/Base64 \
-               XS/Typemap/Typemap Unicode/Normalize/Normalize
+               XS/Typemap/Typemap Unicode/Normalize/Normalize Sys/Hostnamees
+
 
 STATIC_EXT     = DynaLoader
 NONXS_EXT      = Errno
@@ -789,6 +787,7 @@ PEEK                        = $(EXTDIR)\Devel\Peek\Peek
 BYTELOADER             = $(EXTDIR)\ByteLoader\ByteLoader
 DPROF                  = $(EXTDIR)\Devel\DProf\DProf
 GLOB                   = $(EXTDIR)\File\Glob\Glob
+HOSTNAME               = $(EXTDIR)\Sys\Hostname\Hostname
 CWD                    = $(EXTDIR)\Cwd\Cwd
 STORABLE               = $(EXTDIR)\Storable\Storable
 LISTUTIL               = $(EXTDIR)\List\Util
@@ -796,7 +795,9 @@ MIMEBASE64          = $(EXTDIR)\MIME\Base64\Base64
 XSTYPEMAP              = $(EXTDIR)\XS\Typemap\Typemap
 UNICODENORMALIZE       = $(EXTDIR)\Unicode\Normalize\Normalize
 
-EXTENSION_C    =               \
+ERRNO_PM_NW    = $(LIBDIR)\Errno.pm
+
+EXTENSION_C    =               \
                $(SOCKET).c     \
                $(FCNTL).c      \
                $(OPCODE).c     \
@@ -812,6 +813,7 @@ EXTENSION_C =               \
                $(BYTELOADER).c \
                $(DPROF).c      \
                $(GLOB).c       \
+               $(HOSTNAME).c \
                $(CWD).c        \
                $(STORABLE).c   \
                $(LISTUTIL).c   \
@@ -819,6 +821,9 @@ EXTENSION_C =               \
                $(XSTYPEMAP).c  \
                $(UNICODENORMALIZE).c   \
 
+EXTENSION_NPM =        \
+               $(ERRNO_PM_NW)  \
+
 POD2HTML       = $(PODDIR)\pod2html
 POD2MAN                = $(PODDIR)\pod2man
 POD2LATEX      = $(PODDIR)\pod2latex
@@ -1176,6 +1181,12 @@ $(SOCKET_NLP): $(NLM_NAME) $(SOCKET).xs
        $(MAKE)
        cd ..\..\netware
 
+$(HOSTNAME_NLP): $(NLM_NAME) $(HOSTNAME).xs
+       cd $(EXTDIR)\Sys\$(*B)
+       ..\..\..\miniperl -I..\..\..\lib Makefile.PL INSTALLDIRS=perl
+       $(MAKE)
+       cd ..\..\..\netware
+
 $(FCNTL_NLP):
        cd $(EXTDIR)\$(*B)
        ..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
@@ -1425,6 +1436,7 @@ utils: $(BLDDIR)\$(NLM_NAME8).$(NLM_EXT) $(X2P)
 distclean: clean nwclean
        -del /f $(PERLIMPLIB) ..\miniperl.lib $(MINIMOD)
        -del /f *.def *.map
+       -del /f $(EXTENSION_NPM)
        -del /f $(EXTENSION_C) $(DYNALOADER).c $(ERRNO).pm
        -del /f $(EXTDIR)\DynaLoader\dl_netware.xs
        -del /f $(LIBDIR)\.exists $(LIBDIR)\attrs.pm $(LIBDIR)\DynaLoader.pm

diff --git a/NetWare/config_H.wc b/NetWare/config_H.wc
index 12e9a57..1b5d50b 100644 (file)
--- a/NetWare/config_H.wc
+++ b/NetWare/config_H.wc
@@ -2884,7 +2884,7 @@
 #define        UVuf            "lu"            /**/
 #define        UVof            "lo"            /**/
 #define        UVxf            "lx"            /**/
-#define        UVXf            undef           /**/
+#define        UVXf            "lX"            /**/
 #define        NVef            "e"             /**/
 #define        NVff            "f"             /**/
 #define        NVgf            "g"             /**/

diff --git a/NetWare/nwstdio.h b/NetWare/nwstdio.h
index 669ba13..1ddadb5 100644 (file)
--- a/NetWare/nwstdio.h
+++ b/NetWare/nwstdio.h
@@ -45,7 +45,7 @@
 #define PerlIO_puts(f,s)                       (*PL_StdIO->pPuts)(PL_StdIO, (f),(s)) 
 #define PerlIO_read(f,buf,size)                (*PL_StdIO->pRead)(PL_StdIO, (buf), (size), 1, (f))
 #define PerlIO_eof(f)                          (*PL_StdIO->pEof)(PL_StdIO, (f)) 
-#define PerlIO_fdupopen(f)                     (*PL_StdIO->pFdupopen)(PL_StdIO, (f))
+//#define PerlIO_fdupopen(f)                   (*PL_StdIO->pFdupopen)(PL_StdIO, (f))
 #define PerlIO_reopen(p,m,f)           (*PL_StdIO->pReopen)(PL_StdIO, (p), (m), (f))
 #define PerlIO_open(x,y)                       (*PL_StdIO->pOpen)(PL_StdIO, (x),(y))