Add missing include and return value.

3 files changed, 39 insertions, 15 deletions

diff --git a/time/xcal/distinfo b/time/xcal/distinfo
index cbc0a2ed777..bbb480f9eac 100644
--- a/time/xcal/distinfo
+++ b/time/xcal/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2009/07/07 19:55:43 joerg Exp $
+$NetBSD: distinfo,v 1.7 2012/11/01 19:27:36 joerg Exp $
 
 SHA1 (xcal41.tar.Z) = dc2562b9c9fccdee230b3a0b0643d878eae0d014
 RMD160 (xcal41.tar.Z) = 41189d892b98cd4ec3e00f64e48c200169bbfb3e
@@ -8,5 +8,5 @@ SHA1 (patch-ab) = 847c05195281b468d8b913b26f18637964ffd43e
 SHA1 (patch-ac) = 82da3ea57db0ab225066f6b6fd354a83e8cccbc1
 SHA1 (patch-ad) = 5f8a8bc3adf0a90d996191b65599d0252a28de6e
 SHA1 (patch-ae) = d6000c3976bd672feadeda6b97cbf0a07c505418
-SHA1 (patch-af) = 25a51c27827691d1978e2060a82027a006a52c33
-SHA1 (patch-ag) = 0ac3c4a363573b9b20927b7e09cecb2ad7916c66
+SHA1 (patch-af) = 13ba18c5ab562060a7cd3df384d600a5838a5153
+SHA1 (patch-ag) = b4b643b46c9035e41f68e358210a1e7e494b0f71
diff --git a/time/xcal/patches/patch-af b/time/xcal/patches/patch-af
index d692ce2d112..01246f654ef 100644
--- a/time/xcal/patches/patch-af
+++ b/time/xcal/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.2 2006/10/24 11:51:55 dsainty Exp $
+$NetBSD: patch-af,v 1.3 2012/11/01 19:27:36 joerg Exp $
 
---- xcalpr/xcalpr.c.orig	2006-10-20 16:38:40.000000000 +1300
-+++ xcalpr/xcalpr.c	2006-10-24 11:08:56.000000000 +1300
-@@ -59,6 +59,7 @@
+--- xcalpr/xcalpr.c.orig	2012-10-30 21:25:09.000000000 +0000
++++ xcalpr/xcalpr.c
+@@ -59,6 +59,7 @@ static char    *copyright = "@(#)Copyrig
   
  ***/
  #include <stdio.h>
@@ -10,7 +10,7 @@ $NetBSD: patch-af,v 1.2 2006/10/24 11:51:55 dsainty Exp $
  #include <ctype.h>
  #include <string.h>
  #include <time.h>
-@@ -86,7 +87,7 @@
+@@ -86,7 +87,7 @@ static char	*daynames[]	= {"Sun", "Mon",
  
  static char	*dayfiles[7];		/* connected contents of any dayfiles */
  
@@ -19,7 +19,7 @@ $NetBSD: patch-af,v 1.2 2006/10/24 11:51:55 dsainty Exp $
  	
  static int mon[] = { 
      31, 28, 31, 30,
-@@ -100,8 +101,6 @@
+@@ -100,8 +101,6 @@ static int mon[] = { 
  static char	*memerr = "No more memory\n";
  static char	*usage = "Usage: xcalpr [-d dir][-x][-c][-u user][-f file] [month list]\n";
  
@@ -28,7 +28,7 @@ $NetBSD: patch-af,v 1.2 2006/10/24 11:51:55 dsainty Exp $
  /*
   * Routines
   */
-@@ -132,6 +131,8 @@
+@@ -132,6 +131,8 @@ main(argc, argv)
  	int		ac;
  	int		yr;
  
@@ -37,3 +37,12 @@ $NetBSD: patch-af,v 1.2 2006/10/24 11:51:55 dsainty Exp $
  	while ((c = getopt(argc, argv, "d:u:f:cxv")) != EOF) {
  
  		switch (c) {
+@@ -494,7 +495,7 @@ connect_file(filename, bytes)
+  
+         if (statb.st_size == 0) {
+ 		*bytes = 0;
+-		return;
++		return NULL;
+ 	}
+ 
+ 	fibase = readbfile(fd, statb.st_size);
diff --git a/time/xcal/patches/patch-ag b/time/xcal/patches/patch-ag
index d6f7124e352..03e032dbb00 100644
--- a/time/xcal/patches/patch-ag
+++ b/time/xcal/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1 2006/10/24 11:51:55 dsainty Exp $
+$NetBSD: patch-ag,v 1.2 2012/11/01 19:27:36 joerg Exp $
 
---- xcalev/xcalev.c.orig	2006-10-24 11:10:19.000000000 +1300
-+++ xcalev/xcalev.c	2006-10-24 11:13:37.000000000 +1300
-@@ -52,6 +52,7 @@
+--- xcalev/xcalev.c.orig	2012-10-30 21:25:09.000000000 +0000
++++ xcalev/xcalev.c
+@@ -52,11 +52,13 @@ static char    *copyright = "@(#)Copyrig
   
  ***/
  #include <stdio.h>
@@ -10,7 +10,13 @@ $NetBSD: patch-ag,v 1.1 2006/10/24 11:51:55 dsainty Exp $
  #include <ctype.h>
  #include <string.h>
  #include <time.h>
-@@ -88,8 +89,6 @@
+ #include <pwd.h>
+ #include <unistd.h>
++#include <fcntl.h>
+ #if defined(NeXT)
+ #include <sys/fcntl.h>
+ #endif
+@@ -88,8 +90,6 @@ static int	year;			/* year to do the wor
  static char	*memerr = "No more memory\n";
  static char	*usage = "Usage: xcalev [-f srcfile] [-d dir][-x][-r] [year]\n";
  
@@ -19,3 +25,12 @@ $NetBSD: patch-ag,v 1.1 2006/10/24 11:51:55 dsainty Exp $
  /*
   *	routines
   */
+@@ -441,7 +441,7 @@ connect_file(filename, bytes)
+  
+         if (statb.st_size == 0) {
+ 		*bytes = 0;
+-		return;
++		return NULL;
+ 	}
+ 	fibase = readbfile(fd, statb.st_size);
+