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

Comparing ray/src/cv/mgflib/parser.c (file contents):
Revision 1.26 by gregl, Mon Dec 15 09:41:37 1997 UTC vs.
Revision 1.27 by greg, Fri Feb 28 20:11:29 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1996 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   * Parse an MGF file, converting or discarding unsupported entities
6   */
7  
8   #include <stdio.h>
12 – #include <math.h>
9   #include <stdlib.h>
10 + #include <math.h>
11   #include <ctype.h>
12   #include <string.h>
13   #include "parser.h"
# Line 238 | Line 235 | char   *fn;
235                  return(MG_OK);
236          }
237                                          /* get name relative to this context */
238 <        if (mg_file != NULL && (cp = strrchr(mg_file->fname, '/')) != NULL) {
238 >        if (fn[0] != '/' && mg_file != NULL &&
239 >                        (cp = strrchr(mg_file->fname, '/')) != NULL) {
240                  strcpy(ctx->fname, mg_file->fname);
241                  strcpy(ctx->fname+(cp-mg_file->fname+1), fn);
242          } else

Diff Legend

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