Index: /trunk/psastro/src/psastroDemoPlot.c
===================================================================
--- /trunk/psastro/src/psastroDemoPlot.c	(revision 19237)
+++ /trunk/psastro/src/psastroDemoPlot.c	(revision 19238)
@@ -133,6 +133,9 @@
     } else if (key[0] == 's') {
         fprintf (stdout, "enter plot name [rawstars.png]: ");
-        fscanf (stdin, "%s", name);
-        if (!strcmp (name, "")) strcpy (name, "rawstars.png");
+        if (fscanf(stdin, "%s", name) != 1) {
+            psWarning("Unable to read plot name");
+        } else if (!strcmp (name, "")) {
+            strcpy (name, "rawstars.png");
+        }
         KapaPNG (kapa, name);
     }
@@ -190,9 +193,13 @@
     char key[10], name[80];
     fprintf (stdout, "(s)ave plot or [c]ontinue? ");
-    fgets (key, 8, stdin);
-    if (key[0] == 's') {
+    if (!fgets(key, 8, stdin)) {
+        psWarning("Couldn't read anything.");
+    } else if (key[0] == 's') {
         fprintf (stdout, "enter plot name [refstars.png]: ");
-        fscanf (stdin, "%s", name);
-        if (!strcmp (name, "")) strcpy (name, "refstars.png");
+        if (fscanf (stdin, "%s", name) != 1) {
+            psWarning("Unable to read name");
+        } else if (!strcmp (name, "")) {
+            strcpy (name, "refstars.png");
+        }
         KapaPNG (kapa, name);
     }
@@ -419,9 +426,13 @@
     char key[10], name[80];
     fprintf (stdout, "(s)ave plot or [c]ontinue? ");
-    fgets (key, 8, stdin);
-    if (key[0] == 's') {
+    if (!fgets (key, 8, stdin)) {
+        psWarning("Couldn't read anything");
+    } else if (key[0] == 's') {
         fprintf (stdout, "enter plot name [chipfit.png]: ");
-        fscanf (stdin, "%s", name);
-        if (!strcmp (name, "")) strcpy (name, "chipfit.png");
+        if (fscanf (stdin, "%s", name) != 1) {
+            psWarning("Couldn't read name");
+        } else if (!strcmp (name, "")) {
+            strcpy (name, "chipfit.png");
+        }
         KapaPNG (kapa, name);
     }