Changeset ba26129 in mainline

Timestamp:

2009-11-30T18:50:08Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0f06dbc

Parents:

1352fc1

Message:

Prevent overrunning screen width when editing file name.

File:

• uspace/app/edit/edit.c (modified) (5 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);