Insert another symbolic link so it configures on amd64. Fix getline()
conflict. Fix makefiles that weren't stopping on error.

Now builds.


(dholland)

$NetBSD: patch-RULES_rules1_dir,v 1.1 2012/06/16 08:55:55 dholland Exp $

Makefiles should stop on error.

--- RULES/rules1.dir~	2000-12-01 16:13:17.000000000 +0000
+++ RULES/rules1.dir
@@ -32,7 +32,7 @@ $(ALLTARGETS):
 		(								\
 		echo "	==> MAKING \"$@\" ON SUBDIRECTORY \"$(CURDIR)/$$DIR\"";\
 		if [ -d ./$$DIR -a -r ./$$DIR/Makefile ] ; then			\
-			cd ./$$DIR;$(MAKE) $(MAKEMACS) XARCH=$(XARCH) DIRNAME=$(CURDIR)/$$DIR $@;		\
+			cd ./$$DIR;$(MAKE) $(MAKEMACS) XARCH=$(XARCH) DIRNAME=$(CURDIR)/$$DIR $@ || exit 1;	\
 		else								\
 			echo "NOTICE: Partial source ($(CURDIR)/$$DIR) missing";\
 		fi								\

$NetBSD: patch-include_schily_h,v 1.1 2012/06/16 08:55:55 dholland Exp $

Fix symbol name conflict with POSIX getline().

--- include/schily.h	Sat Jun 16 04:48:53 2012 -0400
+++ include/schily.h	Sat Jun 16 04:50:37 2012 -0400
@@ -153,7 +153,7 @@
 extern	char	*findbytes __PR((const void *, int, char));
 extern	int	findline __PR((const char *, char, const char *,
 							int, char **, int));
-extern	int	getline __PR((char *, int));
+extern	int	get_line __PR((char *, int));
 extern	int	getstr __PR((char *, int));
 extern	int	breakline __PR((char *, char, char **, int));
 extern	int	getallargs __PR((int *, char * const**, const char *, ...));

$NetBSD: patch-lib_stdio_fgetline_c,v 1.1 2012/06/16 08:55:55 dholland Exp $

Fix symbol name conflict with POSIX getline().

--- lib/stdio/fgetline.c~	2000-12-03 11:19:29.000000000 +0000
+++ lib/stdio/fgetline.c
@@ -64,7 +64,7 @@ fgetline(f, buf, len)
 }
 
 EXPORT int
-getline(buf, len)
+get_line(buf, len)
 	char	*buf;
 	int	len;
 {

$NetBSD: patch-libscg_scsitransp_c,v 1.1 2012/06/16 08:55:55 dholland Exp $

Fix symbol name conflict with POSIX getline().

--- libscg/scsitransp.c	Sat Jun 16 04:48:53 2012 -0400
+++ libscg/scsitransp.c	Sat Jun 16 04:50:37 2012 -0400
@@ -302,7 +302,7 @@
 
 	js_printf("%s", msg);
 	flush();
-	if (getline(okbuf, sizeof(okbuf)) == EOF)
+	if (get_line(okbuf, sizeof(okbuf)) == EOF)
 		exit(EX_BAD);
 	if(streql(okbuf, "y") || streql(okbuf, "yes") ||
 	   streql(okbuf, "Y") || streql(okbuf, "YES"))

$NetBSD: patch-sformat_defect_c,v 1.1 2012/06/16 08:55:55 dholland Exp $

Fix symbol name conflict with POSIX getline().

--- sformat/defect.c	Sat Jun 16 04:48:53 2012 -0400
+++ sformat/defect.c	Sat Jun 16 04:50:37 2012 -0400
@@ -238,7 +238,7 @@
 	for (;;) {
 		printf("def> ");
 		flush();
-		if ((n = getline(line, 80)) == 0)
+		if ((n = get_line(line, 80)) == 0)
 /*			return (FALSE);*/
 			continue;
 		if (n == EOF)

$NetBSD: patch-sformat_diskfmt_c,v 1.1 2012/06/16 08:55:55 dholland Exp $

Fix symbol name conflict with POSIX getline().

--- sformat/diskfmt.c	Sat Jun 16 04:48:53 2012 -0400
+++ sformat/diskfmt.c	Sat Jun 16 04:50:37 2012 -0400
@@ -1014,7 +1014,7 @@
 	}
 
 	printf("Enter filename for database prototype [proto.dat]: ");flush();
-	(void)getline(name, sizeof(name));
+	(void)get_line(name, sizeof(name));
 	if (name[0] == '\0')
 		strcpy(name, "proto.dat");
 	if (streql(name, "-"))

$NetBSD: patch-sformat_io_c,v 1.1 2012/06/16 08:55:55 dholland Exp $

Fix symbol name conflict with POSIX getline().

--- sformat/io.c	Sat Jun 16 04:48:53 2012 -0400
+++ sformat/io.c	Sat Jun 16 04:50:37 2012 -0400
@@ -245,7 +245,7 @@
 		(*prt)(s, *lp, mini, maxi, dp);
 		flush();
 		line[0] = '\0';
-		if (getline(line, 80) == EOF)
+		if (get_line(line, 80) == EOF)
 			exit(EX_BAD);
 
 		linep = skipwhite(line);
@@ -332,7 +332,7 @@
 	printf("%r", form, args);
 	va_end(args);
 	flush();
-	if (getline(okbuf, sizeof(okbuf)) == EOF)
+	if (get_line(okbuf, sizeof(okbuf)) == EOF)
 		exit(EX_BAD);
 	if (okbuf[0] == '?') {
 		printf("Enter 'y', 'Y', 'yes' or 'YES' if you agree with the previous asked question.\n");
@@ -412,7 +412,7 @@
 		printf("%s [%s]:", s, csp->s_name);
 		flush();
 		line[0] = '\0';
-		if (getline(line, 80) == EOF)
+		if (get_line(line, 80) == EOF)
 			exit(EX_BAD);
 
 		linep = skipwhite(line);

$NetBSD: patch-sformat_makelabel_c,v 1.1 2012/06/16 08:55:55 dholland Exp $

Fix symbol name conflict with POSIX getline().

--- sformat/makelabel.c	Sat Jun 16 04:48:53 2012 -0400
+++ sformat/makelabel.c	Sat Jun 16 04:50:37 2012 -0400
@@ -284,7 +284,7 @@
 	if (yes("Label: <%s> change ? ", labelbuf)) {
 		printf("Enter disk label: "); flush();
 		tty_insert(labelbuf);
-		(void)getline(lbuf, sizeof(lbuf));
+		(void)get_line(lbuf, sizeof(lbuf));
 		strcpy(labelbuf, lbuf);
 		
 	}
@@ -296,7 +296,7 @@
 	if (yes("Volume Name: <%s> change ? ", lbuf)) {
 		printf("Enter volume name: "); flush();
 		tty_insert(lbuf);
-		(void)getline(lbuf, LEN_DKL_VVOL+1);
+		(void)get_line(lbuf, LEN_DKL_VVOL+1);
 		strncpy(lp->dkl_vtoc.v_volume, lbuf, LEN_DKL_VVOL);
 	}
 #endif