Only in waste-ray/: .tm_project.cache
diff -ur waste/Makefile waste-ray/Makefile
--- waste/Makefile	2003-09-15 21:08:04.000000000 -0700
+++ waste-ray/Makefile	2003-09-15 20:36:59.000000000 -0700
@@ -1,9 +1,11 @@
-OBJS = asyncdns.o config.o connection.o filedb.o listen.o m_chat.o m_file.o m_keydist.o \
+OBJS = \
+	asyncdns.o config.o connection.o filedb.o listen.o m_chat.o m_file.o m_keydist.o \
 	m_ping.o m_search.o m_upload.o mqueue.o mqueuelist.o netkern.o sha.o util.o xfers.o \
 	xferwnd.o srchwnd.o srvmain.o blowfish.o m_lcaps.o
 
 
-RSAOBJS = rsa/md5c.o rsa/nn.o rsa/prime.o rsa/r_random.o rsa/rsa.o 
+RSAOBJS = \
+	rsa/md5c.o rsa/nn.o rsa/prime.o rsa/r_random.o rsa/rsa.o 
 
 DEBUGFLAG = -s
 CXXFLAGS = -O2 $(DEBUGFLAG) -pipe -march=pentiumpro
diff -ur waste/Makefile.posix waste-ray/Makefile.posix
--- waste/Makefile.posix	2003-09-15 21:08:04.000000000 -0700
+++ waste-ray/Makefile.posix	2003-09-15 20:36:59.000000000 -0700
@@ -1,9 +1,11 @@
-OBJS = asyncdns.o config.o connection.o filedb.o listen.o m_chat.o m_file.o m_keydist.o \
+OBJS = \
+	asyncdns.o config.o connection.o filedb.o listen.o m_chat.o m_file.o m_keydist.o \
 	m_ping.o m_search.o m_upload.o mqueue.o mqueuelist.o netkern.o sha.o util.o xfers.o \
 	xferwnd.o srchwnd.o srvmain.o blowfish.o m_lcaps.o
 
 
-RSAOBJS = rsa/md5c.o rsa/nn.o rsa/prime.o rsa/r_random.o rsa/rsa.o 
+RSAOBJS = \
+	rsa/md5c.o rsa/nn.o rsa/prime.o rsa/r_random.o rsa/rsa.o 
 
 DEBUGFLAG = -s
 CXXFLAGS = -O2 $(DEBUGFLAG) -pipe -march=pentiumpro
diff -ur waste/blowfish.h waste-ray/blowfish.h
--- waste/blowfish.h	2003-05-26 20:22:36.000000000 -0700
+++ waste-ray/blowfish.h	2003-09-15 20:19:30.000000000 -0700
@@ -40,4 +40,4 @@
 
 #ifdef __cplusplus
 };
-#endif
\ No newline at end of file
+#endif
diff -ur waste/connection.cpp waste-ray/connection.cpp
--- waste/connection.cpp	2003-05-26 20:25:22.000000000 -0700
+++ waste-ray/connection.cpp	2003-09-15 20:33:44.000000000 -0700
@@ -38,7 +38,7 @@
   m_dns=NULL;
   m_ever_connected=0;
   if (loc) m_saddr=*loc;
-  else memset(&m_saddr,0,NULL);
+  else memset(&m_saddr,0,sizeof(m_saddr));
   m_cansend=0;
 }
 
@@ -767,7 +767,7 @@
   if (m_socket==-1) return 0;
   struct sockaddr_in sin;
   memset(&sin,0,sizeof(sin));
-  int len=16;
-  if (::getsockname(m_socket,(struct sockaddr *)&sin,(socklen_t *)&len)) return 0;
+  size_t len=16;
+  if (::getsockname(m_socket,(struct sockaddr *)&sin, &len)) return 0;
   return (unsigned long) sin.sin_addr.s_addr;
-}
+}
diff -ur waste/listen.cpp waste-ray/listen.cpp
--- waste/listen.cpp	2003-05-26 20:29:26.000000000 -0700
+++ waste-ray/listen.cpp	2003-09-15 20:33:53.000000000 -0700
@@ -81,11 +81,11 @@
     return NULL;
   }
 	struct sockaddr_in saddr;
-	int length = sizeof(struct sockaddr_in);
-	int s = accept(m_socket, (struct sockaddr *) &saddr, (socklen_t *)&length);
+	size_t length = sizeof(struct sockaddr_in);
+	int s = accept(m_socket, (struct sockaddr *) &saddr, &length);
   if (s != -1)
   {
     return new C_Connection(s,&saddr);
   }
   return NULL;
-}
+}
diff -ur waste/m_keydist.cpp waste-ray/m_keydist.cpp
--- waste/m_keydist.cpp	2003-05-26 20:31:30.000000000 -0700
+++ waste-ray/m_keydist.cpp	2003-09-15 20:37:30.000000000 -0700
@@ -116,4 +116,4 @@
   memcpy(data,modptr,modlen); data+=modlen;
   memcpy(data,expptr,explen); data+=explen;
   return p;
-}
\ No newline at end of file
+}
diff -ur waste/m_keydist.h waste-ray/m_keydist.h
--- waste/m_keydist.h	2003-05-26 20:31:34.000000000 -0700
+++ waste-ray/m_keydist.h	2003-09-15 20:20:58.000000000 -0700
@@ -52,4 +52,4 @@
 
 };
 
-#endif//_C_MKEYDIST_H_
\ No newline at end of file
+#endif//_C_MKEYDIST_H_
diff -ur waste/m_upload.cpp waste-ray/m_upload.cpp
--- waste/m_upload.cpp	2003-05-26 20:32:40.000000000 -0700
+++ waste-ray/m_upload.cpp	2003-09-15 20:37:28.000000000 -0700
@@ -117,4 +117,4 @@
   ::memcpy(data,m_fn,strlen(m_fn));
 
   return p;
-}
\ No newline at end of file
+}
diff -ur waste/m_upload.h waste-ray/m_upload.h
--- waste/m_upload.h	2003-05-26 20:32:46.000000000 -0700
+++ waste-ray/m_upload.h	2003-09-15 20:20:55.000000000 -0700
@@ -60,4 +60,4 @@
     char *m_fn;
 };
 
-#endif//_C_MUPLOAD_H_
\ No newline at end of file
+#endif//_C_MUPLOAD_H_
diff -ur waste/netkern.cpp waste-ray/netkern.cpp
--- waste/netkern.cpp	2003-05-26 20:35:18.000000000 -0700
+++ waste-ray/netkern.cpp	2003-09-15 20:37:41.000000000 -0700
@@ -819,4 +819,4 @@
   return 0;
 }
 
-#endif//WIN32
\ No newline at end of file
+#endif//WIN32
diff -ur waste/netkern.h waste-ray/netkern.h
--- waste/netkern.h	2003-05-26 20:35:30.000000000 -0700
+++ waste-ray/netkern.h	2003-09-15 20:20:48.000000000 -0700
@@ -38,4 +38,4 @@
 #endif
 
 
-#endif//_NETKERN_H_
\ No newline at end of file
+#endif//_NETKERN_H_
diff -ur waste/netq.h waste-ray/netq.h
--- waste/netq.h	2003-05-26 20:36:24.000000000 -0700
+++ waste-ray/netq.h	2003-09-15 20:37:37.000000000 -0700
@@ -24,4 +24,4 @@
 void LoadNetQ(void);
 void SaveNetQ(void);
 
-#endif
\ No newline at end of file
+#endif
diff -ur waste/platform.h waste-ray/platform.h
--- waste/platform.h	2003-05-26 20:36:56.000000000 -0700
+++ waste-ray/platform.h	2003-09-15 20:24:17.000000000 -0700
@@ -67,6 +67,7 @@
 #define CharNext(x) (x+1)
 #define CharPrev(s,x) ((s)<(x)?(x)-1:(s))
 #define DeleteFile(x) unlink(x)
+#define RemoveDirectory(x) rmdir(x)
 #define CreateDirectory(x,y) mkdir(x,0755)
 #define Sleep(x) usleep(( x )*1000)
 #define stricmp(x,y) strcasecmp(x,y)
@@ -94,4 +95,4 @@
 #define max(x,y) ((y)<(x)?(x):(y))
 #endif
 
-#endif // _PLATFORM_H_
+#endif // _PLATFORM_H_
diff -ur waste/sha.cpp waste-ray/sha.cpp
--- waste/sha.cpp	2003-05-26 20:37:58.000000000 -0700
+++ waste-ray/sha.cpp	2003-09-15 20:37:44.000000000 -0700
@@ -122,4 +122,4 @@
     H[i / 4] <<= 8;
   }
   reset();
-}
\ No newline at end of file
+}
diff -ur waste/sha.h waste-ray/sha.h
--- waste/sha.h	2003-05-26 20:38:04.000000000 -0700
+++ waste-ray/sha.h	2003-09-15 20:19:32.000000000 -0700
@@ -42,4 +42,4 @@
   unsigned long size[2];
 };
 
-#endif//_SHA_H_
\ No newline at end of file
+#endif//_SHA_H_
diff -ur waste/srchwnd.cpp waste-ray/srchwnd.cpp
--- waste/srchwnd.cpp	2003-05-27 18:40:44.000000000 -0700
+++ waste-ray/srchwnd.cpp	2003-09-15 20:37:52.000000000 -0700
@@ -1775,4 +1775,4 @@
 }
 
 
-#endif
\ No newline at end of file
+#endif
diff -ur waste/srchwnd.h waste-ray/srchwnd.h
--- waste/srchwnd.h	2003-05-26 20:40:42.000000000 -0700
+++ waste-ray/srchwnd.h	2003-09-15 20:19:33.000000000 -0700
@@ -65,4 +65,4 @@
 extern HWND g_search_wnd;
 #endif
 
-#endif//_SRCHWND_H_
\ No newline at end of file
+#endif//_SRCHWND_H_
diff -ur waste/srvmain.cpp waste-ray/srvmain.cpp
--- waste/srvmain.cpp	2003-05-27 18:40:56.000000000 -0700
+++ waste-ray/srvmain.cpp	2003-09-15 20:21:41.000000000 -0700
@@ -28,7 +28,7 @@
 */
 
 #include "main.h"
-#include "md5.h"
+#include "rsa/md5.h"
 
 #include "m_upload.h"
 #include "m_chat.h"
@@ -802,5 +802,4 @@
 
   return 0;
 
-}
-
+}
Only in waste-ray/: waste.prj
Only in waste-ray/: waste.prj.bak
Only in waste-ray/: waste.pws
diff -ur waste/xfers.cpp waste-ray/xfers.cpp
--- waste/xfers.cpp	2003-05-26 20:41:46.000000000 -0700
+++ waste-ray/xfers.cpp	2003-09-15 20:20:29.000000000 -0700
@@ -347,7 +347,7 @@
   m_need_reply=1;
   m_reply.set_file_len(m_filelen_bytes_l,m_filelen_bytes_h);
   m_reply.set_file_dates(m_create_date,m_mod_date);
-  m_reply.set_index(-1);
+  m_reply.set_index(~0);
   unsigned int x;
 
   chunks_to_send_pos=0;
@@ -1248,5 +1248,4 @@
     debug_printf("xfer_recv: got %s\n",m_err);
     delete reply;
   }
-}
-
+}
diff -ur waste/xfers.h waste-ray/xfers.h
--- waste/xfers.h	2003-05-26 20:41:52.000000000 -0700
+++ waste-ray/xfers.h	2003-09-15 20:20:49.000000000 -0700
@@ -145,4 +145,4 @@
     int m_adaptive_chunksize;
 };
 
-#endif//_XFERS_H_
\ No newline at end of file
+#endif//_XFERS_H_
diff -ur waste/xferwnd.cpp waste-ray/xferwnd.cpp
--- waste/xferwnd.cpp	2003-05-26 20:42:02.000000000 -0700
+++ waste-ray/xferwnd.cpp	2003-09-15 20:37:49.000000000 -0700
@@ -1254,4 +1254,4 @@
   return 0;
 }
 
-#endif//WIN32
\ No newline at end of file
+#endif//WIN32