Better error checking in helpfile expander.

Tart up some of the output a little.

2 files changed, 3 insertions, 7 deletions

diff --git a/usr.sbin/sade/msg.c b/usr.sbin/sade/msg.c
index fe40ce6..f37b0d3 100644
--- a/usr.sbin/sade/msg.c
+++ b/usr.sbin/sade/msg.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: msg.c,v 1.35 1996/06/08 09:08:43 jkh Exp $
+ * $Id: msg.c,v 1.36 1996/06/14 14:33:57 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -319,8 +319,6 @@ msgWeHaveOutput(char *fmt, ...)
     msgDebug("Notify: %s\n", errstr);
     dialog_clear();
     dialog_msgbox("Information Dialog", errstr, -1, -1, 0);
-    if (OnVTY)
-	msgInfo("Command output is on VTY2 - type ALT-F2 to see it");
 }
 
 /* Simple versions of msgConfirm() and msgNotify() for calling from scripts */
diff --git a/usr.sbin/sade/system.c b/usr.sbin/sade/system.c
index 4dce756..3cb6e47 100644
--- a/usr.sbin/sade/system.c
+++ b/usr.sbin/sade/system.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: system.c,v 1.60 1996/07/05 08:36:02 jkh Exp $
+ * $Id: system.c,v 1.61 1996/07/08 08:54:34 jkh Exp $
  *
  * Jordan Hubbard
  *
@@ -47,7 +47,7 @@ expand(char *fname)
 {
     Mkdir(DOC_TMP_DIR);
     unlink(DOC_TMP_FILE);
-    if (vsystem("gzip -c -d %s > %s", fname, DOC_TMP_FILE))
+    if (!file_readable(fname) || vsystem("gzip -c -d %s > %s", fname, DOC_TMP_FILE))
 	return NULL;
     return DOC_TMP_FILE;
 }
@@ -249,8 +249,6 @@ vsystem(char *fmt, ...)
     else if (!pid) {	/* Junior */
 	(void)sigsetmask(omask);
 	if (DebugFD != -1) {
-	    if (OnVTY && isDebug() && RunningAsInit)
-		msgInfo("Command output is on VTY2 - type ALT-F2 to see it");
 	    dup2(DebugFD, 0);
 	    dup2(DebugFD, 1);
 	    dup2(DebugFD, 2);