fixed endian bug in server.c, status code

now seems to pull in files correctly

Author: brad

chaos/FILE.c

@@ -2558,22 +2558,14 @@ struct xfer *ax;
 #endif
 		if (protocol > 0)
 			(void)sprintf(response,
-#ifdef OSX
 				"%02d/%02d/%02d %02d:%02d:%02d %lld%c%s%c",
-#else
-				"%02d/%02d/%02d %02d:%02d:%02d %ld%c%s%c",
-#endif
 				tm->tm_mon+1, tm->tm_mday, tm->tm_year,
 				tm->tm_hour, tm->tm_min, tm->tm_sec,
 				sbuf.st_size, CHNL,
 				x->x_realname, CHNL);
 		else
 			(void)sprintf(response,
-#ifdef OSX
 				"%d %02d/%02d/%02d %02d:%02d:%02d %lld%c%s%c",
-#else
-				"%d %02d/%02d/%02d %02d:%02d:%02d %ld%c%s%c",
-#endif
 				-1, tm->tm_mon+1, tm->tm_mday,
 				tm->tm_year, tm->tm_hour, tm->tm_min,
 				tm->tm_sec, sbuf.st_size, CHNL,
@@ -3556,11 +3548,7 @@ char *cp;
 static char *
 xgetbsize(struct stat *s, char *cp)
 {
-#ifdef OSX
 	(void)sprintf(cp, "%lld", (s->st_size + FSBSIZE - 1) / FSBSIZE);
-#else
-	(void)sprintf(cp, "%ld", (s->st_size + FSBSIZE - 1) / FSBSIZE);
-#endif
 
 	while (*cp)
 		cp++;
@@ -3581,11 +3569,7 @@ getsize(s, cp)
 register struct stat *s;
 register char *cp;	
 {
-#ifdef OSX
 	(void)sprintf(cp, "%lld", s->st_size);
-#else
-	(void)sprintf(cp, "%ld", s->st_size);
-#endif
 	while (*cp)
 		cp++;
 	return cp;

chaos/client.c

@@ -136,7 +136,7 @@ main()
       for (i = 0; i < 5; i++) {
           send_chaos(n++);
       }
-      sleep(1);
+      sleep(5);
   }
 
   exit(0);

chaos/endian.h

@@ -28,9 +28,13 @@
 #ifdef __BIG_ENDIAN__
 #define LE_TO_SHORT(s) (SWAP_SHORT(s))
 #define LE_TO_LONG(l) (SWAP_LONG(l))
+#define SHORT_TO_LE(s) (SWAP_SHORT(s))
+#define LONG_TO_LE(l) (SWAP_LONG(l))
 #elif defined(__LITTLE_ENDIAN__)
 #define LE_TO_SHORT(s) (s)
 #define LE_TO_LONG(l) (l)
+#define SHORT_TO_LE(s) (s)
+#define LONG_TO_LE(l) (l)
 #else
 #error "No _ENDIAN__ macro defined."
 #endif

chaos/server.c

@@ -521,16 +521,16 @@ read_child_ctl(void)
 
             chst.st_fhost = CH_ADDR_SHORT(conn->cn_faddr);
             chst.st_cnum = conn->cn_ltidx;
-            chst.st_rwsize = conn->cn_rwsize;
-            chst.st_twsize = conn->cn_twsize;
+            chst.st_rwsize = SHORT_TO_LE(conn->cn_rwsize);
+            chst.st_twsize = SHORT_TO_LE(conn->cn_twsize);
             chst.st_state = conn->cn_state;
             chst.st_cmode = conn->cn_mode;
-            chst.st_oroom = conn->cn_twsize -
-                (conn->cn_tlast - conn->cn_tacked);
+            chst.st_oroom = SHORT_TO_LE(conn->cn_twsize -
+                (conn->cn_tlast - conn->cn_tacked));
 
             if ((pkt = conn->cn_rhead) != NOPKT) {
                 chst.st_ptype = pkt->pk_op;
-                chst.st_plength = PH_LEN(pkt->pk_phead);
+                chst.st_plength = SHORT_TO_LE(PH_LEN(pkt->pk_phead));
             } else {
                 chst.st_ptype = 0;
                 chst.st_plength = 0;