Changeset e866806 in mainline for uspace/app/edit/edit.c

Timestamp:

2009-11-30T20:07:07Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4a2aa91b, 8b5001b

Parents:

1df977c (diff), b67c7d64 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge editor fix and string function improvements.

File:

• uspace/app/edit/edit.c (modified) (6 diffs)

uspace/app/edit/edit.c

@@ -102 +102 @@
 #define ED_INFTY 65536
 
+/** Maximum filename length that can be entered. */
+#define INFNAME_MAX_LEN 128
+
 static void key_handle_unmod(console_event_t const *ev);
 static void key_handle_ctrl(console_event_t const *ev);
@@ -331 +334 @@
 }
 
-#define INPUT_MAX_LEN 64
-
 /** Ask for a file name. */
 static char *filename_prompt(char const *prompt, char const *init_value)
@@ -338 +339 @@
         console_event_t ev;
         char *str;
-        wchar_t buffer[INPUT_MAX_LEN + 1];
+        wchar_t buffer[INFNAME_MAX_LEN + 1];
+        int max_len;
         int nc;
         bool done;
@@ -349 +351 @@
         console_set_color(con, COLOR_WHITE, COLOR_BLACK, 0);
 
-        str_to_wstr(buffer, INPUT_MAX_LEN + 1, init_value);
+        max_len = min(INFNAME_MAX_LEN, scr_columns - 4 - str_length(prompt));
+        str_to_wstr(buffer, max_len + 1, init_value);
         nc = wstr_length(buffer);
         done = false;
@@ -376 +379 @@
                                         break;
                                 default:
-                                        if (ev.c >= 32 && nc < INPUT_MAX_LEN) {
+                                        if (ev.c >= 32 && nc < max_len) {
                                                 putchar(ev.c);
                                                 fflush(stdout);
@@ -388 +391 @@
 
         buffer[nc] = '\0';
-
-        str = malloc(STR_BOUNDS(wstr_length(buffer)) + 1);
-        if (str == NULL)
-                return NULL;
-
-        wstr_nstr(str, buffer, STR_BOUNDS(wstr_length(buffer)) + 1);
+        str = wstr_to_astr(buffer);
 
         console_set_color(con, COLOR_BLACK, COLOR_WHITE, 0);