cgram: properly handle input errors

[bsdgames-darwin.git] / warp / util.h

diff --git a/warp/util.h b/warp/util.h
index ed16ccaed61eca9d3fd2daaff42edd07368b6ae2..fae72785f6eebf6706bb6ba7759691fb3b7cbb7b 100644 (file)
--- a/warp/util.h
+++ b/warp/util.h
@@ -1,78 +1,29 @@
-/* $Header: /cvsroot/src/games/warp/util.h,v 1.1 2020/11/09 23:37:05 kamil Exp $ */
+/* Header: util.h,v 7.0 86/10/08 15:14:37 lwall Exp */
 
-/* $Log: util.h,v $
-/* Revision 1.1  2020/11/09 23:37:05  kamil
-/* Add Warp Kit, Version 7.0 by Larry Wall
-/*
-/* Warp is a real-time space war game that doesn't get boring very quickly.
-/* Read warp.doc and the manual page for more information.
-/*
-/* games/warp originally distributed with 4.3BSD-Reno, is back to the BSD
-/* world via NetBSD. Its remnants were still mentioned in games/Makefile.
-/*
-/* Larry Wall, the original author and the copyright holder, generously
-/* donated the game and copyright to The NetBSD Foundation, Inc.
-/*
-/* Import the game sources as-is from 4.3BSD-Reno, with the cession
-/* of the copyright and license to BSD-2-clause NetBSD-style.
-/*
-/* Signed-off-by: Larry Wall <larry@wall.org>
-/* Signed-off-by: Kamil Rytarowski <kamil@netbsd.org>
-/*
+/* Log:        util.h,v
  * Revision 7.0  86/10/08  15:14:37  lwall
  * Split into separate files.  Added amoebas and pirates.
  * 
  */
 
-#if RANDBITS < 15 || defined(lint)
-#define rand_mod(m) getpid()
-#define RANDRAND 0.0
-#define HALFRAND 0
-#define myrand() getpid()
-#else
-#if RANDBITS == 15     /* 15 bits of rand()? */
-#define RANDRAND 268435456.0 /* that's 2**28 */
-#define HALFRAND 0x4000 /* that's 2**14 */
-int rand();
-#define myrand() (rand()&32767)
-#define rand_mod(m) ((int)((double)myrand() / 32768.0 * ((double)(m))))
-/* pick number in 0..m-1 */
-
-#else
+#include <time.h>
+#define __UNCONST(a) ((void *)(unsigned long)(const void *)(a))
 
-#if RANDBITS < 31      /* 16 bits of rand()? */
-#define RANDRAND 1073741824.0 /* that's 2**30 */
-#define HALFRAND 0x8000 /* that's 2**15 */
-unsigned rand();
-#define myrand() (rand()&65535)
-#define rand_mod(m) ((int)((double)myrand() / 65536.0 * ((double)(m))))
-/* pick number in 0..m-1 */
-
-#else          /* assume 31 bits */
 #define RANDRAND 1152921504606846976.0 /* that's 2**60 */
 #define HALFRAND 0x40000000 /* that's 2**30 */
-long rand();
-#define myrand() rand()
+#define myrand() (int)random()
 #define rand_mod(m) ((myrand() / 37) % (m)) /* pick number in 0..m-1 */
 /*
  * The reason for the /37 above is that our random number generator yields
  * successive evens and odds, for some reason.  This makes strange star maps.
  */
-#endif
-#endif
-#endif
-
 
     /* we get fractions of seconds from calling ftime on timebuf */
 
-EXT struct timeb timebuf;
-#define roundsleep(x) (ftime(&timebuf),sleep(timebuf.millitm > 500?x+1:x))
-
-void movc3();
-void no_can_do();
-int exdis();
+extern struct timespec timebuf;
+#define roundsleep(x) (clock_gettime(CLOCK_REALTIME, &timebuf),sleep(timebuf.tv_nsec > (500 * 1000 * 1000) ?x+1:x))
 
-EXT bool waiting INIT(FALSE);          /* are we waiting for subprocess (in doshell)? */
+#define waiting 0
 
 #ifdef NOTDEF
 EXT int len_last_line_got INIT(0);
@@ -87,16 +38,17 @@ EXT int len_last_line_got INIT(0);
 #define MD_FILE 1
 #endif
 
-void util_init();
-char   *safemalloc();
-char   *safecpy();
-char   *cpytill();
-char   *instr();
+void util_init(void);
+void movc3(int, char *, char *);
+__dead void no_can_do(const char *);
+int exdis(int);
+void *safemalloc(size_t size);
+char *safecpy(char *, const char *, size_t);
+char *cpytill(char *, const char *, int);
+char *instr(const char *, const char *);
 #ifdef SETUIDGID
-    int                eaccess();
+int eaccess(const char *, mode_t);
 #endif
-char   *getwd();
-void   cat();
-void   prexit();
-char   *savestr();
-char   *getval();
+__dead void prexit(const char *);
+char *savestr(const char *);
+char *getval(const char *, const char *);