1. Silence warning.

2. Deal with potential whitespace evil early (PR#7455).

5 files changed, 10 insertions, 7 deletions

diff --git a/release/sysinstall/kget.c b/release/sysinstall/kget.c
index c972255..325cdaa 100644
--- a/release/sysinstall/kget.c
+++ b/release/sysinstall/kget.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: kget.c,v 1.6 1999/05/05 11:34:03 jkh Exp $
+ * $Id: kget.c,v 1.7 1999/05/06 11:03:17 jkh Exp $
  */
 
 #include "sysinstall.h"
@@ -39,7 +39,7 @@ kget(char *out)
     char *mib1 = "machdep.uc_devlist";
     char *mib2 = "machdep.uc_pnplist";
     char name[9];
-    FILE *fout;
+    FILE *fout = NULL;
     struct isa_device *id;
     struct pnp_cinfo *c;
     char *p;
diff --git a/release/sysinstall/label.c b/release/sysinstall/label.c
index 6b69e0f..c7bf150 100644
--- a/release/sysinstall/label.c
+++ b/release/sysinstall/label.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: label.c,v 1.87 1999/03/09 12:36:28 jkh Exp $
+ * $Id: label.c,v 1.88 1999/03/30 04:09:21 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -368,6 +368,7 @@ get_mountpoint(struct chunk *old)
 	old->flags &= ~CHUNK_IS_ROOT;
 
     safe_free(tmp);
+    val = string_skipwhite(string_prune(val));
     tmp = new_part(val, TRUE, 0);
     if (old) {
 	old->private_data = tmp;
diff --git a/usr.sbin/sade/label.c b/usr.sbin/sade/label.c
index 6b69e0f..c7bf150 100644
--- a/usr.sbin/sade/label.c
+++ b/usr.sbin/sade/label.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: label.c,v 1.87 1999/03/09 12:36:28 jkh Exp $
+ * $Id: label.c,v 1.88 1999/03/30 04:09:21 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -368,6 +368,7 @@ get_mountpoint(struct chunk *old)
 	old->flags &= ~CHUNK_IS_ROOT;
 
     safe_free(tmp);
+    val = string_skipwhite(string_prune(val));
     tmp = new_part(val, TRUE, 0);
     if (old) {
 	old->private_data = tmp;
diff --git a/usr.sbin/sysinstall/kget.c b/usr.sbin/sysinstall/kget.c
index c972255..325cdaa 100644
--- a/usr.sbin/sysinstall/kget.c
+++ b/usr.sbin/sysinstall/kget.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: kget.c,v 1.6 1999/05/05 11:34:03 jkh Exp $
+ * $Id: kget.c,v 1.7 1999/05/06 11:03:17 jkh Exp $
  */
 
 #include "sysinstall.h"
@@ -39,7 +39,7 @@ kget(char *out)
     char *mib1 = "machdep.uc_devlist";
     char *mib2 = "machdep.uc_pnplist";
     char name[9];
-    FILE *fout;
+    FILE *fout = NULL;
     struct isa_device *id;
     struct pnp_cinfo *c;
     char *p;
diff --git a/usr.sbin/sysinstall/label.c b/usr.sbin/sysinstall/label.c
index 6b69e0f..c7bf150 100644
--- a/usr.sbin/sysinstall/label.c
+++ b/usr.sbin/sysinstall/label.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: label.c,v 1.87 1999/03/09 12:36:28 jkh Exp $
+ * $Id: label.c,v 1.88 1999/03/30 04:09:21 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -368,6 +368,7 @@ get_mountpoint(struct chunk *old)
 	old->flags &= ~CHUNK_IS_ROOT;
 
     safe_free(tmp);
+    val = string_skipwhite(string_prune(val));
     tmp = new_part(val, TRUE, 0);
     if (old) {
 	old->private_data = tmp;