Changeset 789a7e in git for kernel/feread.cc

Timestamp:

Mar 18, 2014, 10:47:28 AM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '873fc1222e995d7cb33f79d8f1792ce418c8c72c')

Children:

706597eca3628b2f2f0d581d93c41b9e6ac6f466863b034c410acb811c24ee04be54bc876e5af90f

Parents:

412d157f1cb2da32046fa9199662ceeb12ea8dcc

Message:

fix: tr.586 and bit-8 stuff

File:

• kernel/feread.cc (modified) (5 diffs)

kernel/feread.cc

@@ -181 +181 @@
   #define x_rl_filename_completion_function rl_filename_completion_function
 #endif
-  if (x_rl_line_buffer[start-1]=='"')
+  if ((start>0) && (x_rl_line_buffer[start-1]=='"'))
     return x_rl_completion_matches (text, (RL_PROC)x_rl_filename_completion_function);
   char **m=x_rl_completion_matches (text, (RL_PROC)command_generator);
@@ -208 +208 @@
   line = readline (pr);
 
-  int i;
-  for (i=strlen(line)-1;i>=0;i--) line[i]=line[i]&127;
-
   if (line==NULL)
     return NULL;
 
+  int l=strlen(line);
+  for (int i=l-1;i>=0;i--) line[i]=line[i]&127;
+
   if (*line!='\0')
   {
     add_history (line);
   }
-  int l=strlen(line);
   if (l>=size-1)
   {
@@ -273 +272 @@
     return NULL;
 
-  int i;
-  for (i=strlen(line)-1;i>=0;i--) line[i]=line[i]&127;
+  int l=strlen(line);
+  for (int i=l-1;i>=0;i--) line[i]=line[i]&127;
 
   if (*line!='\0')
@@ -280 +279 @@
     (*fe_add_history) (line);
   }
-  int l=strlen(line);
   if (l>=size-1)
   {
@@ -308 +306 @@
   mflush();
   char *line=fgets(s,size,stdin);
-  int i;
-  for (i=strlen(line)-1;i>=0;i--) line[i]=line[i]&127;
+  if (line!=NULL)
+    for (int i=strlen(line)-1;i>=0;i--) line[i]=line[i]&127;
   return line;
 }