Make sure there is room for the terminating NUL character when

printing symlinks (bump PORTREVISION).
Mash the patches into one.

PR:		ports/14824
Submitted by:	Sergey Shkonda <serg@bcs.zp.ua>
Approved by:	wosch (maintainer, timeout 2228 days)

4 files changed, 38 insertions, 40 deletions

diff --git a/sysutils/stat/Makefile b/sysutils/stat/Makefile
index 79decc61820e..b21d1f4b4193 100644
--- a/sysutils/stat/Makefile
+++ b/sysutils/stat/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	stat
 PORTVERSION=	1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://wolfram.schneider.org/src/
 
diff --git a/sysutils/stat/files/patch-aa b/sysutils/stat/files/patch-aa
deleted file mode 100644
index 9362d2a13ac3..000000000000
--- a/sysutils/stat/files/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
---- stat.fmt.c.orig	Sun Feb 16 05:12:33 1997
-+++ stat.fmt.c	Sun Sep 19 09:55:50 1999
-@@ -440,7 +440,7 @@
- 					break;
- 
- 				case 'd':	/* The Device	*/
--					sprintf(auxbuf, "%ld", ip -> st_dev);
-+					sprintf(auxbuf, "%2d,%-2d",  major(ip -> st_dev), minor(ip -> st_dev));
- 					bufp = fmt_app(auxbuf, bufp);
- 					break;
- 
---- stat.fmt.c.orig	Tue Dec 28 12:14:24 1999
-+++ stat.fmt.c	Tue Dec 28 12:15:20 1999
-@@ -502,2 +502,3 @@
- 	}
-+	*bufp++ = '\0';
- }
diff --git a/sysutils/stat/files/patch-ab b/sysutils/stat/files/patch-ab
deleted file mode 100644
index 7c912c4f9e4e..000000000000
--- a/sysutils/stat/files/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
---- stat.fmt.c.orig	Sun Feb 16 08:12:33 1997
-+++ stat.fmt.c	Wed Nov 17 14:57:30 1999
-@@ -279,6 +279,8 @@
- 					break;
- 		case	S_IFSOCK:	buf[5 + 0] = 's';
- 					break;
-+		case	S_IFIFO:	buf[5 + 0] = 'p';
-+					break;
- 		default		:	buf[5 + 0] = '?';
- 	}
- }
-@@ -328,6 +330,10 @@
- 
- 		case	S_IFSOCK:
- 			strcpy(buf, "Socket");
-+			break;
-+
-+		case	S_IFIFO:
-+			strcpy(buf, "FIFO");
- 			break;
- 
- 		default:
diff --git a/sysutils/stat/files/patch-stat.fmt.c b/sysutils/stat/files/patch-stat.fmt.c
new file mode 100644
index 000000000000..842b42886889
--- /dev/null
+++ b/sysutils/stat/files/patch-stat.fmt.c
@@ -0,0 +1,37 @@
+--- stat.fmt.c.orig	Mon Feb 17 00:12:33 1997
++++ stat.fmt.c	Sat Dec 17 16:08:52 2005
+@@ -98,12 +98,11 @@
+ 	}
+ 
+ 	if( (Sbuf.st_mode & S_IFMT) == S_IFLNK) {
+-		if( (count = readlink(filename, Lbuf, sizeof Lbuf)) == FAIL) {
++		if( (count = readlink(filename, Lbuf, sizeof Lbuf-1)) == FAIL) {
+ 			fprintf(stderr, "Can't readlink %s\n", filename);
+ 			return(FAIL);
+ 		}
+-		if( count < LBUFSIZ)
+-			Lbuf[count] = '\0';
++		Lbuf[count] = '\0';
+ 		printf("  File: \"%s\" -> \"%s\"\n", filename, Lbuf);
+ 	} else
+ 		printf("  File: \"%s\"\n", filename);
+@@ -279,6 +278,8 @@
+ 					break;
+ 		case	S_IFSOCK:	buf[5 + 0] = 's';
+ 					break;
++		case	S_IFIFO:	buf[5 + 0] = 'p';
++					break;
+ 		default		:	buf[5 + 0] = '?';
+ 	}
+ }
+@@ -328,6 +329,10 @@
+ 
+ 		case	S_IFSOCK:
+ 			strcpy(buf, "Socket");
++			break;
++
++		case	S_IFIFO:
++			strcpy(buf, "FIFO");
+ 			break;
+ 
+ 		default: