- use constant MAX_INPUTLINE

Changed files:
    screen-inputline-size.patch -> 1.2

diff --git a/screen-inputline-size.patch b/screen-inputline-size.patch
index a6ff9428db59a4875bb523f32dd4f8318078aa00..53065e6f836996b1322f62cf8365662d7b93588e 100644 (file)
--- a/screen-inputline-size.patch
+++ b/screen-inputline-size.patch
@@ -1,10 +1,8 @@
---- screen-4.0.2/input.c~      2003-09-08 17:25:37.000000000 +0300
-+++ screen-4.0.2/input.c       2006-02-22 23:38:20.000000000 +0200
-@@ -36,9 +36,10 @@
- extern struct display *display;
- extern struct mchar mchar_blank, mchar_so;
+diff -u screen-4.0.2/input.c screen-4.0.2/input.c
+--- screen-4.0.2/input.c       2006-02-22 23:38:20.000000000 +0200
++++ screen-4.0.2/input.c       2006-02-23 00:31:34.000000000 +0200
+@@ -38,7 +38,7 @@
  
-+#define MAX_INPUTLINE 512
  struct inpline
  {
 -  char  buf[101];     /* text buffer */
@@ -12,7 +10,7 @@
    int  len;           /* length of the editible string */
    int  pos;           /* cursor position in editable string */
  };
-@@ -49,7 +50,7 @@
+@@ -49,7 +49,7 @@
  struct inpdata
  {
    struct inpline inp;
@@ -21,25 +19,26 @@
    char *inpstring;    /* the prompt */
    int  inpstringlen;  /* length of the prompt */
    int  inpmode;               /* INP_NOECHO, INP_RAW, INP_EVERY */
-@@ -116,8 +117,8 @@
+@@ -116,8 +116,8 @@
    int maxlen;
    struct inpdata *inpdata;
    
 -  if (len > 100)
 -    len = 100;
 +  if (len > MAX_INPUTLINE - 1)
-+    len = MAX_INPUTLINE;
++    len = MAX_INPUTLINE - 1;
    if (!(mode & INP_NOECHO))
      {
        maxlen = flayer->l_width - 1 - strlen(istr);
---- screen-4.0.2/process.c~    2006-02-23 00:05:06.000000000 +0200
-+++ screen-4.0.2/process.c     2006-02-23 00:27:01.000000000 +0200
+diff -u screen-4.0.2/process.c screen-4.0.2/process.c
+--- screen-4.0.2/process.c     2006-02-23 00:27:01.000000000 +0200
++++ screen-4.0.2/process.c     2006-02-23 00:32:27.000000000 +0200
 @@ -1891,7 +1891,7 @@
        ChangeAKA(fore, *args, strlen(*args));
        break;
      case RC_COLON:
 -      Input(":", 100, INP_COOKED, Colonfin, NULL);
-+      Input(":", 512-1, INP_COOKED, Colonfin, NULL);
++      Input(":", MAX_INPUTLINE - 1, INP_COOKED, Colonfin, NULL);
        if (*args && **args)
        {
          s = *args;
@@ -48,7 +47,19 @@
              break;
            }
 -        Input("New screen password:", 100, INP_NOECHO, pass1, display ? (char *)D_user : (char *)users);
-+        Input("New screen password:", 512-1, INP_NOECHO, pass1, display ? (char *)D_user : (char *)users);
++        Input("New screen password:", MAX_INPUTLINE - 1, INP_NOECHO, pass1, display ? (char *)D_user : (char *)users);
        }
        break;
  #endif                                /* PASSWORD */
+only in patch2:
+unchanged:
+--- screen-4.0.2/screen.h~     2006-02-23 00:27:51.000000000 +0200
++++ screen-4.0.2/screen.h      2006-02-23 00:31:32.000000000 +0200
+@@ -270,6 +270,7 @@
+ #define INP_RAW               2
+ #define INP_EVERY     4
+ 
++#define MAX_INPUTLINE 512
+ 
+ #ifdef MULTIUSER
+ struct acl