f952b14fca3833e9d8fef0ae8a086ad15485b552 galt Wed Jan 1 02:11:38 2025 -0800 fix various errors for utils compiled on Rocky 9 hgwdev-new. diff --git src/hg/mouseStuff/knownVsBlat/kvsSummary.c src/hg/mouseStuff/knownVsBlat/kvsSummary.c index 4b3d3f4..c6a446b 100644 --- src/hg/mouseStuff/knownVsBlat/kvsSummary.c +++ src/hg/mouseStuff/knownVsBlat/kvsSummary.c @@ -153,45 +153,52 @@ } lineFileClose(&lf); return chromHash; } void kvsSummary(char *outName, int inCount, char *inNames[]) /* kvsSummary - Summarize output of a bunch of knownVsBlats. */ { int i; struct hash *catHash = newHash(8); /* Catagory hash */ struct slName *catList = NULL, *cat; /* Catagory list. */ struct hash *allChromHash = newHash(0); /* Chromosome hash. */ struct chrom *chromList = NULL, *chrom; /* Chromosome list. */ struct hash *runHash = newHash(0); /* Which run this is in. */ struct run *runList = NULL, *run; /* Info about a run. */ -char runNameBuf[64], *runName; +char *runName; +char ext[FILEEXT_LEN]; +char fileName[FILENAME_LEN]; FILE *f = mustOpen(outName, "w"); /* Read input files into a bunch of hashes. */ for (i=0; i<inCount; ++i) { char *inName = inNames[i]; /* Figure out name of run from fileName - prefer suffix. */ - runName = runNameBuf; - runName[0] = 0; - splitPath(inName, NULL, NULL, runNameBuf); - if (runNameBuf[0] == 0) - splitPath(inName, NULL, runNameBuf, NULL); + ext[0] = 0; + splitPath(inName, NULL, NULL, ext); + if (ext[0] == 0) + { + splitPath(inName, NULL, fileName, NULL); + runName = fileName; + } else + { + runName = ext; runName += 1; + } AllocVar(run); slAddHead(&runList, run); hashAddSaveName(runHash, runName, run, &run->name); run->chromHash = readRun(inName, allChromHash, &chromList, catHash, &catList); } slReverse(&chromList); slReverse(&runList); slReverse(&catList); /* Write output. */ for (chrom = chromList; chrom != NULL; chrom = chrom->next) { /* Print header. */ fprintf(f, ">>>>==== %s totals ====<<<<\n", chrom->name); fprintf(f, "%-15s", "region");