fix some compilation warnings

3 files changed, 40 insertions, 13 deletions

diff --git a/misc/dialog/files/patch-sum b/misc/dialog/files/patch-sum
index 0e367f07159..2d90ed47925 100644
--- a/misc/dialog/files/patch-sum
+++ b/misc/dialog/files/patch-sum
@@ -1,9 +1,9 @@
-$NetBSD: patch-sum,v 1.4 2000/10/31 16:26:32 jlam Exp $
+$NetBSD: patch-sum,v 1.5 2000/11/10 00:40:34 wiz Exp $
 
 MD5 (patch-aa) = ea3d6ec909f34013ec8b48a72ba7fd23
 MD5 (patch-ab) = a6e4b6347dd3c99599e4ac105fe18c0c
-MD5 (patch-ac) = 021f89a83b9b9bfe9f3eda9642692a34
-MD5 (patch-ad) = f300af373e3eaa1bf725482ee4aee725
+MD5 (patch-ac) = 5a4df860bda8b9c0f526684bae0d4f08
+MD5 (patch-ad) = 3bbf036d26cc2e4622fb3e7f979fabe7
 MD5 (patch-ae) = 92565660ae9f15aa02c55d36a77ef035
 MD5 (patch-af) = 8977954a03cef19d316549f581b031ca
 MD5 (patch-ag) = 3e2db5d0d16bfe6655d6a5037fc1d9e2
diff --git a/misc/dialog/patches/patch-ac b/misc/dialog/patches/patch-ac
index de3b4893e1a..03884fd369f 100644
--- a/misc/dialog/patches/patch-ac
+++ b/misc/dialog/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.5 2000/07/28 20:30:11 jlam Exp $
+$NetBSD: patch-ac,v 1.6 2000/11/10 00:40:35 wiz Exp $
 
---- dialog.h.orig	Fri Aug 18 07:35:06 1995
-+++ dialog.h	Fri Jul 28 15:30:22 2000
+--- dialog.h.orig	Fri Aug 18 13:35:06 1995
++++ dialog.h
 @@ -28,8 +28,12 @@
  #ifdef ultrix
  #include <cursesX.h>
@@ -23,13 +23,21 @@ $NetBSD: patch-ac,v 1.5 2000/07/28 20:30:11 jlam Exp $
  #define MIN(x,y) (x < y ? x : y)
  #define MAX(x,y) (x > y ? x : y)
  
-@@ -150,6 +155,9 @@
- #ifdef HAVE_NCURSES
+@@ -151,6 +156,9 @@
  void draw_shadow (WINDOW * win, int y, int x, int height, int width);
  #endif
-+
+ 
 +int strheight (const char *p);
 +int strwidth (const char *p);
- 
++
  int dialog_yesno (const char *title, const char *prompt, int height, int width);
  int dialog_msgbox (const char *title, const char *prompt, int height,
+ 		int width, int pause);
+@@ -196,6 +204,7 @@
+ extern __inline__ int
+ mouse_wgetch (WINDOW * win)
+ {
++return 0;
+ };
+ 
+ #define mouse_wgetch(w) wgetch(w)
diff --git a/misc/dialog/patches/patch-ad b/misc/dialog/patches/patch-ad
index ac62c096838..aa8f001a257 100644
--- a/misc/dialog/patches/patch-ad
+++ b/misc/dialog/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.2 1998/08/07 11:10:14 agc Exp $
+$NetBSD: patch-ad,v 1.3 2000/11/10 00:40:35 wiz Exp $
 
---- guage.c.orig	Fri Jan 23 17:37:12 1998
-+++ guage.c	Fri Jan 23 17:37:12 1998
+--- guage.c.orig	Sat Aug 12 00:54:52 1995
++++ guage.c
 @@ -38,6 +38,11 @@
      char prompt_buf[1024];
      WINDOW *dialog;
@@ -14,3 +14,22 @@ $NetBSD: patch-ad,v 1.2 1998/08/07 11:10:14 agc Exp $
      /* center dialog box on screen */
      x = (COLS - width) / 2;
      y = (LINES - height) / 2;
+@@ -86,15 +91,15 @@
+ 
+ 	if (feof (stdin))
+ 	    break;
+-	gets (buf);
++	fgets (buf, sizeof(buf), stdin);
+ 	if (buf[0] == 'X') {
+ 	    /* Next line is percentage */
+-	    gets (buf);
++	    fgets (buf, sizeof(buf), stdin);
+ 	    percent = atoi (buf);
+ 
+ 	    /* Rest is message text */
+ 	    prompt_buf[0] = '\0';
+-	    while (strncmp (gets (buf), "XXX", 3))
++	    while (strncmp (fgets (buf, sizeof(buf), stdin), "XXX", 3))
+ 		strcat (prompt_buf, buf);
+ 	    prompt = prompt_buf;
+ 	} else