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

Comparing ray/src/rt/editline.c (file contents):
Revision 2.2 by greg, Wed Oct 26 10:04:12 1994 UTC vs.
Revision 2.9 by greg, Thu Nov 14 02:05:09 2013 UTC

# Line 1 | Line 1
1 /* Copyright (c) 1987 Regents of the University of California */
2
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6
4   /*
5   *  editline.c - routine for editing raw input for rview.
6   *
7 < *      10/5/88
7 > *  External symbols declared in driver.h
8   */
9  
10 + #include "copyright.h"
11 +
12 + #include <stdio.h>
13 + #include <string.h>
14 +
15 + #include "color.h"
16 +
17 + #include "driver.h"
18 +
19   #define iscntrl(c)      ((c) < ' ')
20   #define isblank(c)      ((c) == ' ')
21   #define iserase(c)      ((c) == '\b' || (c) == 127)
# Line 17 | Line 23 | static char SCCSid[] = "$SunId$ LBL";
23   #define iskill(c)       ((c) == 'U'-'@' || (c) == 'X'-'@')
24  
25  
26 < editline(buf, c_get, s_put)     /* edit input line */
27 < char  *buf;
28 < int  (*c_get)(), (*s_put)();
26 > void
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 63 | Line 72 | int  (*c_get)(), (*s_put)();
72   }
73  
74  
66 #include  "driver.h"
67
75   static char  mybuf[512];
76  
77  
78 < tocombuf(b, d)                          /* add command(s) to my buffer */
79 < register char  *b;
80 < register struct driver  *d;
78 > void
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 <        while (*cp++ = *b)
90 <                if (*b++ == '\n')
89 >        comstart = cp;
90 >        while ( (*cp++ = *b) )
91 >                if (cp >= mybuf+sizeof(mybuf)) {
92 >                        *comstart = '\0';
93 >                        return;         /* what should I do about this? */
94 >                } else if (*b++ == '\n') {
95                          d->inpready++;
96 +                        comstart = cp;
97 +                }
98   }
99  
100  
101 < fromcombuf(b, d)                        /* get command from my buffer */
102 < char  *b;
103 < struct driver  *d;
101 > int
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 99 | Line 117 | struct driver  *d;
117                                                  /* send it as reply */
118          strcpy(b, mybuf);
119          d->inpready--;
120 <                                                /* get next command */
121 <        strcpy(mybuf, cp);
120 >                                                /* advance commands */
121 >        cp1 = mybuf;
122 >        while ((*cp1++ = *cp++))
123 >                ;
124          return(1);
125   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines