[PC-BSD Commits] r7244 - pcbsd-projects/txt-sysinstall

[svn at pcbsd.org]

Author: johnh
Date: 2010-07-20 23:22:39 -0700 (Tue, 20 Jul 2010)
New Revision: 7244

Modified:
   pcbsd-projects/txt-sysinstall/Makefile
   pcbsd-projects/txt-sysinstall/components.c
   pcbsd-projects/txt-sysinstall/install.c
   pcbsd-projects/txt-sysinstall/packages.c
   pcbsd-projects/txt-sysinstall/txt-sysinstall.h
Log:
Bugfixes.


Modified: pcbsd-projects/txt-sysinstall/Makefile
===================================================================
--- pcbsd-projects/txt-sysinstall/Makefile	2010-07-20 15:57:34 UTC (rev 7243)
+++ pcbsd-projects/txt-sysinstall/Makefile	2010-07-21 06:22:39 UTC (rev 7244)
@@ -5,7 +5,7 @@
 SRCS+=	tzone.c components.c util.c install.c medium.c label.c ftp.c
 SRCS+=	packages.c
 
-CFLAGS+=	-ggdb -DDEBUG -D__PCBSD__ 
+CFLAGS+=	-ggdb -DDEBUG 
 
 WARNS=	3
 

Modified: pcbsd-projects/txt-sysinstall/components.c
===================================================================
--- pcbsd-projects/txt-sysinstall/components.c	2010-07-20 15:57:34 UTC (rev 7243)
+++ pcbsd-projects/txt-sysinstall/components.c	2010-07-21 06:22:39 UTC (rev 7244)
@@ -47,7 +47,7 @@
 {
 	appendconfig("installType", self->prompt);
 	if (!strcmp(self->prompt, "FreeBSD"))
-		appendconfig("packageType", "tar");
+		appendconfig("packageType", "split");
 	else
 		appendconfig("packageType", "uzip");
 
@@ -140,11 +140,11 @@
 		for (i = 0;i < MAXCOMP;i++) {
 			if (components[i].selected) {
 				if (compstr[0] == 0) {
-					ptr = strcat(ptr, components[i].name);
+					strlcat(ptr, components[i].name, BUFSZ);
 
 				} else {
-					ptr = strcat(ptr, ",");
-					ptr = strcat(ptr, components[i].name);
+					strlcat(ptr, ",", BUFSZ);
+					strlcat(ptr, components[i].name, BUFSZ);
 				}
 			}
 		}

Modified: pcbsd-projects/txt-sysinstall/install.c
===================================================================
--- pcbsd-projects/txt-sysinstall/install.c	2010-07-20 15:57:34 UTC (rev 7243)
+++ pcbsd-projects/txt-sysinstall/install.c	2010-07-21 06:22:39 UTC (rev 7244)
@@ -43,6 +43,8 @@
 static void
 show_progress(char *line)
 {
+		dialog_busy(5, 60, line);
+#if 0
 	static int nfiles = 0, cfile = 0;
 	static char value[64];
 	char prompt[64];
@@ -91,6 +93,7 @@
 		    (cfile * 100) / nfiles);
 
 	}
+#endif
 }
 
 static int signaled = 0;

Modified: pcbsd-projects/txt-sysinstall/packages.c
===================================================================
--- pcbsd-projects/txt-sysinstall/packages.c	2010-07-20 15:57:34 UTC (rev 7243)
+++ pcbsd-projects/txt-sysinstall/packages.c	2010-07-21 06:22:39 UTC (rev 7244)
@@ -322,11 +322,11 @@
 			STAILQ_FOREACH(pi, &pch->packagelist, entries) {
 				if (pi->selected) {
 					if (pkgstr[0] == 0) {
-						ptr = strcat(ptr, pi->package);
+						strlcat(ptr, pi->package, PKGSTRSIZE);
 
 					} else {
-						ptr = strcat(ptr, ",");
-						ptr = strcat(ptr, pi->package);
+						strlcat(ptr, ",", PKGSTRSIZE);
+						strlcat(ptr, pi->package, PKGSTRSIZE);
 					}
 				}
 			}

Modified: pcbsd-projects/txt-sysinstall/txt-sysinstall.h
===================================================================
--- pcbsd-projects/txt-sysinstall/txt-sysinstall.h	2010-07-20 15:57:34 UTC (rev 7243)
+++ pcbsd-projects/txt-sysinstall/txt-sysinstall.h	2010-07-21 06:22:39 UTC (rev 7244)
@@ -30,7 +30,7 @@
 #define	OSNAME	"FreeBSD"
 #endif
 
-#define SCRIPTS_PATH	"./"
+#define SCRIPTS_PATH	"/usr/sbin/"
 #define PCSYSINSTALL	"/usr/sbin/pc-sysinstall"
 
 #define	BUFSZ	1024*1024