/[ascend]/trunk/base/generic/compiler/packages.c
ViewVC logotype

Diff of /trunk/base/generic/compiler/packages.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 542 by johnpye, Wed Apr 26 15:15:40 2006 UTC revision 543 by johnpye, Thu Apr 27 00:04:13 2006 UTC
# Line 148  int test_librarysearch(struct FilePath * Line 148  int test_librarysearch(struct FilePath *
148    
149      ospath_strcpy(fp,ls->fullpath,PATH_MAX);      ospath_strcpy(fp,ls->fullpath,PATH_MAX);
150      CONSOLE_DEBUG("SEARCHING FOR %s",ls->fullpath);      CONSOLE_DEBUG("SEARCHING FOR %s",ls->fullpath);
151        
152      f = ospath_fopen(fp,"r");      f = ospath_fopen(fp,"r");
153      if(f==NULL){      if(f==NULL){
154            ospath_free(fp);
155          return 0;          return 0;
156      }      }
157      fclose(f);      fclose(f);
158    
159      CONSOLE_DEBUG("FOUND! %s",ls->fullpath);      ERROR_REPORTER_HERE(ASC_PROG_NOTE,"FOUND! %s",ls->fullpath);
160      return 1;      return 1;
161  }  }
162    
# Line 184  char *SearchArchiveLibraryPath(CONST cha Line 185  char *SearchArchiveLibraryPath(CONST cha
185      extern char path_var[PATH_MAX];      extern char path_var[PATH_MAX];
186      char *path;      char *path;
187    
188      fp1 = ospath_new(name);      fp1 = ospath_new_from_posix(name);
189      fp2 = ospath_getdir(fp1);      fp2 = ospath_getdir(fp1);
190      s1 = ospath_getfilestem(fp1);      s1 = ospath_getfilestem(fp1);
191      if(s1==NULL){      if(s1==NULL){
# Line 193  char *SearchArchiveLibraryPath(CONST cha Line 194  char *SearchArchiveLibraryPath(CONST cha
194      }      }
195    
196      CONSOLE_DEBUG("FILESTEM = '%s'",s1);      CONSOLE_DEBUG("FILESTEM = '%s'",s1);
197        
198  #if defined(ASC_SHLIBSUFFIX) && defined(ASC_SHLIBPREFIX)  #if defined(ASC_SHLIBSUFFIX) && defined(ASC_SHLIBPREFIX)
199      snprintf(buffer,PATH_MAX,"%s%s%s",ASC_SHLIBPREFIX,s1,ASC_SHLIBSUFFIX);      snprintf(buffer,PATH_MAX,"%s%s%s",ASC_SHLIBPREFIX,s1,ASC_SHLIBSUFFIX);
200  #else  #else
# Line 267  int LoadArchiveLibrary(CONST char *parti Line 268  int LoadArchiveLibrary(CONST char *parti
268          return 1;          return 1;
269      }      }
270    
271      fp1 = ospath_new(partialname);      fp1 = ospath_new_from_posix(partialname);
272      stem = ospath_getfilestem(fp1);      stem = ospath_getfilestem(fp1);
273      if(stem==NULL){      if(stem==NULL){
274          ERROR_REPORTER_NOLINE(ASC_PROG_ERROR,"What is the stem of named library '%s'???",partialname);          ERROR_REPORTER_NOLINE(ASC_PROG_ERROR,"What is the stem of named library '%s'???",partialname);

Legend:
Removed from v.542  
changed lines
  Added in v.543

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22