Changeset 355 for Whitix/trunk/user/fruity

Timestamp:

04/24/08 23:33:02 (7 months ago)

Author:

mwhitworth

Message:

Add check for empty string in Ctrl+S.

Files:

• Whitix/trunk/user/fruity/main.c (modified) (6 diffs)

Whitix/trunk/user/fruity/main.c

@@ -1 +1 @@
 #include <console.h>
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -63 +64 @@
         ConsEraseLine();
 
-        va_start(args,message);
-        vprintf(message,args);
+        va_start(args, message);
+        vprintf(message, args);
         va_end(args);
         ConsColorReset(0);
@@ -501 +502 @@
 int PromptGetString(char* prompt,char** str)
 {
-        /* Read data into str, TODO */
         PromptSet(prompt);
         int c,i=0;
@@ -527 +527 @@
                 }else if (c < 0x80)
                 {
-                        (*str)[i++]=(int)c;
+                        (*str)[i++]=(char)c;
                         putchar(c);
                 }
@@ -576 +576 @@
         case 's':
                 /* Save as the current filename. If there isn't one, ask for it */
-                if (!fileName)
+                if (!fileName || !strlen(fileName))
                 {
                         if (PromptGetString("Filename? (ESC to cancel) : ",&fileName))
@@ -583 +583 @@
 
                 if (!SaveFile(fileName))
-                        PromptSet("Saved '%s'",fileName);
+                        PromptSet("Saved '%s'", fileName);
                 else
-                        PromptSet("Failed to save '%s'",fileName);
+                        PromptSet("Failed to save '%s': %s", fileName, strerror(errno));
 
                 break;