ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/rt/editline.c
(Generate patch)

Comparing ray/src/rt/editline.c (file contents):
Revision 2.6 by greg, Mon Jun 30 19:04:29 2003 UTC vs.
Revision 2.9 by greg, Thu Nov 14 02:05:09 2013 UTC

# Line 10 | Line 10 | static const char      RCSid[] = "$Id$";
10   #include "copyright.h"
11  
12   #include <stdio.h>
13 + #include <string.h>
14  
15   #include "color.h"
16  
# Line 23 | Line 24 | static const char      RCSid[] = "$Id$";
24  
25  
26   void
27 < editline(buf, c_get, s_put)     /* edit input line */
28 < char  *buf;
29 < int  (*c_get)();
30 < void  (*s_put)();
27 > editline(       /* edit input line */
28 >        char  *buf,
29 >        dr_getchf_t *c_get,
30 >        dr_comoutf_t *s_put
31 > )
32   {
33          static char  erases[] = "\b \b";
34          static char  obuf[4];
35 <        register int  i;
36 <        register int  c;
35 >        int  i;
36 >        int  c;
37          
38          i = 0;
39          while ((c = (*c_get)()&0177) != '\n' && c != '\r')
# Line 74 | Line 76 | static char  mybuf[512];
76  
77  
78   void
79 < tocombuf(b, d)                          /* add command(s) to my buffer */
80 < register char  *b;
81 < register struct driver  *d;
79 > tocombuf(                               /* add command(s) to my buffer */
80 >        char  *b,
81 >        struct driver  *d
82 > )
83   {
84 <        register char  *cp;
84 >        char  *cp;
85          char  *comstart;
86  
87          for (cp = mybuf; *cp; cp++)
88                  ;
89          comstart = cp;
90 <        while (*cp++ = *b)
90 >        while ( (*cp++ = *b) )
91                  if (cp >= mybuf+sizeof(mybuf)) {
92                          *comstart = '\0';
93                          return;         /* what should I do about this? */
# Line 96 | Line 99 | register struct driver  *d;
99  
100  
101   int
102 < fromcombuf(b, d)                        /* get command from my buffer */
103 < char  *b;
104 < struct driver  *d;
102 > fromcombuf(                             /* get command from my buffer */
103 >        char  *b,
104 >        struct driver  *d
105 > )
106   {
107 <        register char   *cp;
107 >        char    *cp, *cp1;
108                                                  /* get next command */
109          for (cp = mybuf; *cp != '\n'; cp++)
110                  if (!*cp)
# Line 114 | Line 118 | struct driver  *d;
118          strcpy(b, mybuf);
119          d->inpready--;
120                                                  /* advance commands */
121 <        strcpy(mybuf, cp);
121 >        cp1 = mybuf;
122 >        while ((*cp1++ = *cp++))
123 >                ;
124          return(1);
125   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)