ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/runParallel/getfile.c
(Generate patch)

Comparing trunk/runParallel/getfile.c (file contents):
Revision 2933 by chuckv, Fri Jul 14 20:39:56 2006 UTC vs.
Revision 2956 by chuckv, Wed Jul 19 16:08:12 2006 UTC

# Line 11 | Line 11 | int mynode;
11   int mynode;
12   //int nfiles(char* dirname[MAXPATHLEN + 1]);
13  
14 + int amber_rst(const struct dirent * dir);
15 + //int alphasort(struct direct **d1, struct direct **d2);
16  
15
16
17   int nfiles(char* dirname[MAXPATHLEN + 1],int extension)
18   {
19    int nfiles;
20    mydir =  (char*)dirname;
21    mynode = extension;
22 <  nfiles = scandir((char*)dirname, &namelist, amber_rst, alphasort);
22 >  nfiles = scandir(".", &namelist, amber_rst, alphasort);
23    return(nfiles);
24   }
25  
26 < void getfilename(int which, char* fname) {
27 <  char* filename;
26 > char* getfilename(int which) {
27 >  char* fname;
28    int i;
29  
30 <  filename = namelist[which]->d_name;
30 >  fname = namelist[which]->d_name;
31 >  return fname;
32   /*
33    for (i = 0; i < strlen(filename); i++) {
34      fname[i] = filename[i];
# Line 44 | Line 45 | amber_rst(const struct dirent * dir)
45  
46    struct stat     buf;
47    char            filename[MAXPATHLEN + 1];
48 +  size_t namelen;
49    char            *base, *exten;
50    char            *dot = ".";
51 <  char            *extenpattern;
51 >  char            extenpattern[5];
52 >  char* oldexten;
53 >  sprintf(filename, "%s/%s",".", dir->d_name);
54 >        
55    
51  sprintf(filename, "%s/%s", mydir, dir->d_name);
52  
56    if (stat(filename, &buf) != 0)
57      {
58        return (0);
# Line 62 | Line 65 | amber_rst(const struct dirent * dir)
65    
66    sprintf(filename, "%s", dir->d_name);
67    base = (char*)strtok(filename, ".");
68 <  exten=strtok(NULL,"\0");
69 <  sprintf(extenpattern,"%i",mynode);
68 >  //namelen = strlen(base);
69 >  while (base != NULL){
70 >        exten = base;
71 >        base=(char*)strtok(NULL,".");
72 > //      printf("Exten contains: %s\n",exten);
73 >  }
74 >  sprintf(extenpattern,"%s%i","node",mynode);
75 > //  printf("Exten contains: %s\n",exten);
76  
77 <  if (strcasecmp(exten, extenpattern))
78 <    {
79 <      return (0);
80 <    }  
72 <  return (1);
77 >  if (exten!=NULL && !strcasecmp(exten,extenpattern))
78 >    {  
79 >      return (1);
80 >    }  
81  
82 +  return (0);
83 +
84   }
85  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines