Quick Search:

Mode

Context

Displaying 3 lines of context. None | Less | More | Full

Other Diffs

Ignore

Blank Lines Whitespace: Expand:

Diff

1.150
 
1.151
 
MAIN:ragge:20120730095152
 
cpp.c
_>8080 int ofd;
 8181 usch outbuf[CPPBUF];
 8282 int obufp, istty;
<>83 -int Cflag, Mflag, dMflag, Pflag;
 84 -usch *Mfile;
  83+int Cflag, Mflag, dMflag, Pflag, MPflag;
  84+usch *Mfile, *MPfile, *Mxfile;
8585 struct initar *initar;
 8686 int readmac, lastoch;
 8787 
     
 !
152152         (void)gettimeofday(&t1, NULL);
 153153 #endif
 154154 
<>155 -        while ((ch = getopt(argc, argv, "CD:d:I:i:MPS:tU:Vv")) != -1) {
  155+        while ((ch = getopt(argc, argv, "CD:d:I:i:MPS:tU:Vvx:")) != -1) {
156156                 switch (ch) {
 157157                 case 'C': /* Do not discard comments */
 158158                         Cflag++;
     
 !
211211                         printf("cpp: %s\n", VERSSTR);
 212212                         break;
 213213 
<> 214+                case 'x':
  215+                        if (strcmp(optarg, "MP") == 0) {
  216+                                MPflag++;
  217+                        } else if (strncmp(optarg, "MT,", 3) == 0 ||
  218+                            strncmp(optarg, "MQ,", 3) == 0) {
  219+                                usch *cp, *fn;
  220+                                fn = stringbuf;
  221+                                for (cp = (usch *)&optarg[3]; *cp; cp++) {
  222+                                        if (*cp == '$' && optarg[1] == 'Q')
  223+                                                savch('$');
  224+                                        savch(*cp);
  225+                                }
  226+                                savstr((usch *)"");
  227+                                if (Mxfile) { savch(' '); savstr(Mxfile); }
  228+                                savch(0);
  229+                                Mxfile = fn;
  230+                        } else
  231+                                usage();
  232+                        break;
  233+
214234                 case '?':
 215235                 default:
 216236                         usage();
     
 !
272292                         c++;
 273293                 Mfile = stringbuf;
 274294                 savstr(c); savch(0);
<> 295+                if (MPflag) {
  296+                        MPfile = stringbuf;
  297+                        savstr(c); savch(0);
  298+                }
  299+                if (Mxfile)
  300+                        Mfile = Mxfile;
275301                 if ((c = (usch *)strrchr((char *)Mfile, '.')) == NULL)
 276302                         error("-M and no extension: ");
 277303                 c[1] = 'o';
     
 !
907933         savch(0);
 908934         if (ifiles != NULL) {
 909935                 t = sheap("%s:%d: warning: ", ifiles->fname, ifiles->lineno);
<>910 -                write (2, t, strlen((char *)t));
  936+                dummy = write (2, t, strlen((char *)t));
<_911937         }
 912938         dummy = write (2, s, strlen((char *)s));
 913939         dummy = write (2, "\n", 1);
FishEye: Open Source License registered to PCC.
Your maintenance has expired. You can renew your license at http://www.atlassian.com/fisheye/renew
Atlassian FishEye, CVS analysis. (Version:1.6.3 Build:build-336 2008-11-04) - Administration - Page generated 2014-09-20 05:59 +0200