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.4 by greg, Sat Feb 22 02:07:28 2003 UTC vs.
Revision 2.9 by greg, Thu Nov 14 02:05:09 2013 UTC

# Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7   *  External symbols declared in driver.h
8   */
9  
10 < /* ====================================================================
11 < * The Radiance Software License, Version 1.0
12 < *
13 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
14 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
15 < *
16 < * Redistribution and use in source and binary forms, with or without
17 < * modification, are permitted provided that the following conditions
18 < * are met:
19 < *
20 < * 1. Redistributions of source code must retain the above copyright
21 < *         notice, this list of conditions and the following disclaimer.
22 < *
23 < * 2. Redistributions in binary form must reproduce the above copyright
24 < *       notice, this list of conditions and the following disclaimer in
25 < *       the documentation and/or other materials provided with the
26 < *       distribution.
27 < *
28 < * 3. The end-user documentation included with the redistribution,
29 < *           if any, must include the following acknowledgment:
30 < *             "This product includes Radiance software
31 < *                 (http://radsite.lbl.gov/)
32 < *                 developed by the Lawrence Berkeley National Laboratory
33 < *               (http://www.lbl.gov/)."
34 < *       Alternately, this acknowledgment may appear in the software itself,
35 < *       if and wherever such third-party acknowledgments normally appear.
36 < *
37 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
38 < *       and "The Regents of the University of California" must
39 < *       not be used to endorse or promote products derived from this
40 < *       software without prior written permission. For written
41 < *       permission, please contact [email protected].
42 < *
43 < * 5. Products derived from this software may not be called "Radiance",
44 < *       nor may "Radiance" appear in their name, without prior written
45 < *       permission of Lawrence Berkeley National Laboratory.
46 < *
47 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
48 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
49 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
50 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
51 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
52 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
53 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
54 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
55 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
56 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
57 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
58 < * SUCH DAMAGE.
59 < * ====================================================================
60 < *
61 < * This software consists of voluntary contributions made by many
62 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
63 < * information on Lawrence Berkeley National Laboratory, please see
64 < * <http://www.lbl.gov/>.
65 < */
10 > #include "copyright.h"
11  
12 + #include <stdio.h>
13 + #include <string.h>
14 +
15   #include "color.h"
16  
17   #include "driver.h"
# Line 76 | 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 127 | 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 149 | 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 167 | 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
> Changed lines