Date: Thu, 27 Dec 2001 06:30:52 +0000 (GMT) From: Bruce M Simpson <bms@spc.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/33225: Build breaks on CURRENT due to <sys/dir.h> changes Message-ID: <20011227063052.DC4A42102C@kiowa.dek.spc.org> In-Reply-To: <200112270620.fBR6K0O27596@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
>Number: 33225
>Category: ports
>Synopsis: Build breaks on CURRENT due to <sys/dir.h> changes
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Dec 26 22:40:01 PST 2001
>Closed-Date:
>Last-Modified:
>Originator: Bruce M Simpson
>Release: FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD kiowa.dek.spc.org 5.0-CURRENT FreeBSD 5.0-CURRENT #7: Mon Dec 24 04:57:54 GMT 2001 root@kiowa.dek.spc.org:/usr/src/sys/i386/compile/KIOWA i386
>Description:
Build actually breaks due to stdout no longer being usable as
a constant initializer in mmv.c (changes in libc).
>How-To-Repeat:
Try building on CURRENT without the patch below.
>Fix:
Modified patch-aa file for CURRENT is enclosed.
Only change was to shift initialization of outfile to happen
at runtime from main().
--- patch-aa begins here ---
--- mmv.c.orig Thu Dec 27 06:12:50 2001
+++ mmv.c Thu Dec 27 06:26:29 2001
@@ -88,7 +88,6 @@
#endif
#include <stdio.h>
-#include <ctype.h>
#ifdef MSDOS
/* for MS-DOS (under Turbo C 1.5)*/
@@ -126,7 +125,6 @@
#include <sys/file.h>
extern char *getenv();
-extern long lseek();
extern char *malloc();
#ifdef DIRENT
@@ -176,7 +174,6 @@
#else
/* for System V and BSD */
-#include <string.h>
#include <sys/signal.h>
#include <fcntl.h>
#endif
@@ -370,7 +367,7 @@
static int snap(/* REP *first, REP *p */);
static void showdone(/* REP *fin */);
static void breakout(/* */);
-static int breakrep(/* */);
+static void breakrep(/* */);
static void breakstat(/* */);
static void quit(/* */);
static int copymove(/* REP *p */);
@@ -389,7 +386,6 @@
static int getstat(/* char *full, FILEINFO *f */);
static int dwritable(/* HANDLE *h */);
static int fwritable(/* char *hname, FILEINFO *f */);
-static void memmove(/* void *to, void *from, int k */);
#endif
#ifndef RENAME
static int rename(/* char *from, char *to */);
@@ -410,7 +406,7 @@
static SLICER slicer[2] = {{NULL, NULL, 0}, {NULL, NULL, 0}};
static int badreps = 0, paterr = 0, direrr, failed = 0, gotsig = 0, repbad;
-static FILE *outfile = stdout;
+static FILE *outfile;
static char IDF[] = "$$mmvdid.";
static char TEMP[] = "$$mmvtmp.";
@@ -471,6 +467,7 @@
{
char *frompat, *topat;
+ outfile = stdout;
init();
procargs(argc, argv, &frompat, &topat);
domatch(frompat, topat);
@@ -2550,10 +2547,9 @@
}
-static int breakrep()
+static void breakrep()
{
gotsig = 1;
- return(1);
}
@@ -2832,7 +2828,7 @@
}
-#ifndef MSDOS
+#if 0
static void memmove(to, from, k)
char *to, *from;
unsigned k;
--- patch-aa ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20011227063052.DC4A42102C>