From ucs.usc.edu!taweil Thu Oct 12 17:18:01 1995
From:	Ta-Wei Li <taweil@ucs.usc.edu>
To:	steve@ecf.toronto.edu
Subject: u9fs patch for NeXTSTEP

diff -p u9fs/libc.h u9fs.next/libc.h
*** u9fs/libc.h	Tue Oct  3 22:50:59 1995
--- u9fs.next/libc.h	Wed Oct  4 00:05:11 1995
***************
*** 2,8 ****
--- 2,10 ----
   * mem routines
   */
  void*	memset(void*, int, Ulong);
+ #ifndef NeXT
  int	memcmp(void*, void*, Ulong);
+ #endif /* !NeXT */
  void*	memmove(void*, void*, Ulong);
  void*	memchr(void*, int, Ulong);
  void*	memccpy(void*, void*, int, Ulong);
*************** void*	memccpy(void*, void*, int, Ulong);
*** 12,25 ****
--- 14,31 ----
   */
  char*	strcat(char*, char*);
  char*	strchr(char*, char);
+ #ifndef NeXT
  int	strcmp(char*, char*);
  char*	strcpy(char*, char*);
+ #endif /* !NeXT */
  char*	strncat(char*, char*, long);
  char*	strncpy(char*, char*, long);
  int	strncmp(char*, char*, long);
  char*	strrchr(char*, char);
  char*	strtok(char*, char*);
+ #ifndef NeXT
  long	strlen(char*);
+ #endif /* !NeXT */
  long	strspn(char*, char*);
  long	strcspn(char*, char*);
  char*	strpbrk(char*, char*);
diff -p u9fs/makefile u9fs.next/makefile
*** u9fs/makefile	Tue Oct  3 22:51:00 1995
--- u9fs.next/makefile	Wed Oct  4 00:11:55 1995
***************
*** 1,8 ****
! CFLAGS=-N -I. -I/usr/include -A -A -DBIGEND -DSYSV -DNEEDPROTO -DLOG='"/tmp/u9fs.log"'
  
  
! u9fs:	u9fs.o conv.o memmove.o mfmt.o mkfile
! 	lcc -o u9fs u9fs.o conv.o memmove.o mfmt.o -lbsd
  
  %.o:	%.c  u.h libc.h 9p.h
! 	lcc -c $(CFLAGS) $<
--- 1,18 ----
! CC=cc
! CFLAGS= -O -I. -I/usr/include -DBSD -DNEEDPROTO -DLOG='"/tmp/u9fs.log"'
  
+ BINPATH=/usr/local/plan9/unix/bin
  
! OBJS=u9fs.o conv.o memmove.o mfmt.o
! 
! u9fs:	mkfile ${OBJS} 
! 	${CC} -o u9fs ${OBJS}
  
  %.o:	%.c  u.h libc.h 9p.h
! 	${CC} -c $(CFLAGS) $<
! 
! clean: 
! 	rm -f *.o u9fs *~
! 
! install: u9fs
! 	install -c -m 755 u9fs $(BINPATH)
diff -p u9fs/memmove.c u9fs.next/memmove.c
*** u9fs/memmove.c	Tue Oct  3 22:51:00 1995
--- u9fs.next/memmove.c	Wed Oct  4 00:05:46 1995
***************
*** 3,8 ****
--- 3,9 ----
  #include <sys/stat.h>
  #include "libc.h"
  
+ #ifndef NeXT
  /*
   * Portable version for systems from the ancien regime
   */
*************** back:
*** 31,33 ****
--- 32,35 ----
  	}
  	return a1;
  }
+ #endif /* !NeXT */
diff -p u9fs/u9fs.c u9fs.next/u9fs.c
*** u9fs/u9fs.c	Tue Oct  3 22:51:04 1995
--- u9fs.next/u9fs.c	Wed Oct  4 00:11:01 1995
*************** erealloc(void *p, unsigned n)
*** 1088,1093 ****
--- 1088,1104 ----
  	return p;
  }
  
+ #ifdef NeXT
+ char *strdup (char *s)
+ {
+     char *tmp;
+ 
+     tmp = malloc(strlen(s)+1);
+     strcpy (tmp, s);
+     return tmp;
+ }
+ #endif
+ 
  char*
  estrdup(char *p)
  {