[patch] libreadline-java-0.8.0-getline.patch

libreadline-java-0.8.0-getline.patch (text/plain), 3.94 KB, created by Boris on 2011-07-22 19:50:09 UTC

diff -ur libreadline-java-0.8.0/src/native/getline.c libreadline-java-0.8.0.patched/src/native/getline.c
--- libreadline-java-0.8.0/src/native/getline.c	2003-01-07 11:14:35.000000000 +0100
+++ libreadline-java-0.8.0.patched/src/native/getline.c	2011-07-22 21:30:30.928369002 +0200
@@ -41,7 +41,7 @@
 
 /********************* exported interface ********************************/
 
-char           *getline();		/* read a line of input */
+char           *get_line();		/* read a line of input */
 void            gl_setwidth();		/* specify width of screen */
 void            gl_histadd();		/* adds entries to hist */
 void		gl_strwidth();		/* to bind gl_strlen */
@@ -387,7 +387,7 @@
         hist_init();
     }
     if (isatty(0) == 0 || isatty(1) == 0)
-	gl_error("\n*** Error: getline(): not interactive, use stdio.\n");
+	gl_error("\n*** Error: get_line(): not interactive, use stdio.\n");
     gl_char_init();
     gl_init_done = 1;
 }
@@ -414,7 +414,7 @@
 }
 
 char *
-getline(prompt)
+get_line(prompt)
 char *prompt;
 {
     int             c, loc, tmp;
@@ -585,7 +585,7 @@
     int  i;
 
     if (gl_cnt >= BUF_SIZE - 1)
-	gl_error("\n*** Error: getline(): input buffer overflow\n");
+	gl_error("\n*** Error: get_line(): input buffer overflow\n");
     if (gl_overwrite == 0 || gl_pos == gl_cnt) {
         for (i=gl_cnt; i >= gl_pos; i--)
             gl_buf[i+1] = gl_buf[i];
@@ -608,7 +608,7 @@
     if (len > 0) {
 	if (gl_overwrite == 0) {
             if (gl_cnt + len >= BUF_SIZE - 1) 
-	        gl_error("\n*** Error: getline(): input buffer overflow\n");
+	        gl_error("\n*** Error: get_line(): input buffer overflow\n");
             for (i=gl_cnt; i >= gl_pos; i--)
                 gl_buf[i+len] = gl_buf[i];
 	    for (i=0; i < len; i++)
@@ -617,7 +617,7 @@
 	} else {
 	    if (gl_pos + len > gl_cnt) {
                 if (gl_pos + len >= BUF_SIZE - 1) 
-	            gl_error("\n*** Error: getline(): input buffer overflow\n");
+	            gl_error("\n*** Error: get_line(): input buffer overflow\n");
 		gl_buf[gl_pos + len] = 0;
             }
 	    for (i=0; i < len; i++)
@@ -657,7 +657,7 @@
     int loc = gl_width - 5;	/* shifts line back to start position */
 
     if (gl_cnt >= BUF_SIZE - 1) 
-        gl_error("\n*** Error: getline(): input buffer overflow\n");
+        gl_error("\n*** Error: get_line(): input buffer overflow\n");
     if (gl_out_hook) {
 	change = gl_out_hook(gl_buf);
         len = strlen(gl_buf);
@@ -916,7 +916,7 @@
     char *p = buf;
     int len;
 
-    /* in case we call gl_histadd() before we call getline() */
+    /* in case we call gl_histadd() before we call get_line() */
     if (gl_init_done < 0) {		/* -1 only on startup */
         hist_init();
         gl_init_done = 0;
diff -ur libreadline-java-0.8.0/src/native/getline.h libreadline-java-0.8.0.patched/src/native/getline.h
--- libreadline-java-0.8.0/src/native/getline.h	2003-01-07 11:14:35.000000000 +0100
+++ libreadline-java-0.8.0.patched/src/native/getline.h	2011-07-22 21:29:35.908369001 +0200
@@ -7,9 +7,9 @@
 
 /* readline compatibility stuff */
 
-extern char* rl_readline_name;                  /* unused by getline   */
+extern char* rl_readline_name;                  /* unused by get_line   */
 #define add_history(buffer) gl_histadd(buffer)
-#define readline(buffer)    getline(buffer)
+#define readline(buffer)    get_line(buffer)
 #define clear_history()     hist_init()
 #define using_history()     hist_init()
 
@@ -18,7 +18,7 @@
 
 typedef size_t (*gl_strwidth_proc)(char *);
 
-char           *getline(char *);		/* read a line of input */
+char           *get_line(char *);		/* read a line of input */
 void            gl_setwidth(int);		/* specify width of screen */
 void            gl_histadd(char *);		/* adds entries to hist */
 void		gl_strwidth(gl_strwidth_proc);	/* to bind gl_strlen */
@@ -30,7 +30,7 @@
 
 #else	/* not __STDC__ */
 
-char           *getline();	
+char           *get_line();	
 void            gl_setwidth();
 void            gl_histadd();
 void		gl_strwidth();