Import ncpfs 0.7

util/Makefile

@@ -6,7 +6,7 @@ INCLUDES =  -I/usr/src/linux/include -I../kernel
 BINDIR = ../bin
 UTILS = ncpmount ncpumount ncptest ipx_configure
 
-CFLAGS = -Wall $(INCLUDES) -g
+CFLAGS = -Wall $(INCLUDES) -O2
 CC = gcc
 
 all: $(UTILS)

util/ipxutil.h

@@ -54,11 +54,15 @@ struct ipx_rip_packet {
 #define IPX_BROADCAST_NODE "\xff\xff\xff\xff\xff\xff"
 #define IPX_THIS_NODE      "\0\0\0\0\0\0"
 
+#ifndef IPX_NODE_LEN
+#define IPX_NODE_LEN (6)
+#endif
 
 typedef unsigned long  IPXNet;
 typedef unsigned short IPXPort;
 typedef unsigned char  IPXNode[IPX_NODE_LEN];
 
+
 void ipx_print_node(IPXNode node);
 void ipx_print_network(IPXNet net);
 void ipx_print_port(IPXPort port);

util/ncplib_user.c

@@ -6,7 +6,8 @@ typedef __u16 word;
 typedef __u32 dword;
 
 #include <sys/ioctl.h>
-#include <sys/wait.h>
+/* #include <sys/wait.h> */  /* generates a warning here */
+extern pid_t wait(int *);
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
@@ -175,7 +176,7 @@ ncp_user_request(struct ncp_server *server, int function)
 
 	result = r->completion_code;
 
-	if (result != 0) {
+	if ((result != 0) && (server->silent == 0)) {
 		ncp_printf("ncp_completion_code: %d\n", result);
 	}
 	return result;	

util/ncptest.c

@@ -629,7 +629,7 @@ main(int argc, char **argv)
 		exit(1);
 	}
 
-	test_touch(server);
+	getchar();
 
 	ncp_disconnect(server);
 	

util/start_ipx

@@ -4,5 +4,4 @@
 # 00001b038b11 is the server's node number.
 #
 ipx_interface add -p eth0 EtherII 10
-ipx_route add 1992 10 00001b3bc0c9
 ipx_route add 1234 10 00001b038b11