Description: upstream: harden: migration: strcpy/strcat to asprintf This patch fixes the buffer overflow vulnerabilities in filename management as reported in #915571. However, instead of replacing the `strcpy' and `strcat' with their respective counterparts `strncpy' and `strncat', it uses the safer `asprintf' wrt to the recommendation to the GNU gcc manual. Origin: debian Forwarded: https://github.com/4ti2/4ti2/pull/47 Author: Jerome Benoit Last-Update: 2025-05-24 --- a/src/util/gensymm.c +++ b/src/util/gensymm.c @@ -29,9 +29,9 @@ /* Created : 26-AUG-02 */ /* */ /* ----------------------------------------------------------------- */ +#include #include #include -#include #include "myheader.h" #include "print.h" #include "vector.h" @@ -39,10 +39,6 @@ #include #include "banner.h" -#ifndef PATH_MAX -#define PATH_MAX FILENAME_MAX -#endif - /* ----------------------------------------------------------------- */ void printPermutationToFile(FILE *out, vector v, int numOfVars) { int i; @@ -104,7 +100,8 @@ int gensymm_main(int argc, char *argv[]) { int a,i,j,k,l,x,y,z,w,numOfVars,numOfGenerators,infoLevel; vector v; - char fileName[PATH_MAX],outFileName[PATH_MAX]; + const char *fileName=NULL; + char *outFileName=NULL; FILE *out; int optc; @@ -143,7 +140,7 @@ /* We require that all 1's come last in the tuple (x,y,z,w). */ - strcpy(fileName,argv[argc-1]); + fileName=argv[argc-1]; x=atoi(argv[argc-5]); y=atoi(argv[argc-4]); z=atoi(argv[argc-3]); @@ -169,11 +166,11 @@ /* Now we are back in business. */ - strcpy(outFileName,fileName); - strcat(outFileName,".sym"); + myxasprintf(&outFileName,"%s.sym",fileName); + errno=0; if (!(out = fopen(outFileName,"w"))) { - printf("Error opening generator file for output."); + printf("Error opening generator file for output (%s).\n",strerror(errno)); exit (0); } @@ -395,6 +392,9 @@ printPermutationToFile(out, v, numOfVars); } + fclose(out); + + free(outFileName); return(0); } --- a/m4/gnulib-cache.m4 +++ b/m4/gnulib-cache.m4 @@ -1,8 +1,8 @@ -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# Copyright (C) 2002-2025 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or +# the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # This file is distributed in the hope that it will be useful, @@ -11,7 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this file. If not, see . +# along with this file. If not, see . # # As a special exception to the GNU General Public License, # this file may be distributed as part of a program that @@ -27,11 +27,23 @@ # Specification in the form of a command-line invocation: -# gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --no-conditional-dependencies --no-libtool --macro-prefix=gl getopt-gnu +# gnulib-tool --import \ +# --lib=libgnu \ +# --source-base=lib \ +# --m4-base=m4 \ +# --doc-base=doc \ +# --tests-base=tests \ +# --aux-dir=. \ +# --no-conditional-dependencies \ +# --no-libtool \ +# --macro-prefix=gl \ +# vasprintf \ +# getopt-gnu # Specification in the form of a few gnulib-tool.m4 macro invocations: gl_LOCAL_DIR([]) gl_MODULES([ + vasprintf getopt-gnu ]) gl_AVOID([]) --- a/src/util/genmodel.c +++ b/src/util/genmodel.c @@ -29,9 +29,9 @@ /* Created : 01-JUL-03 */ /* */ /* ----------------------------------------------------------------- */ +#include #include #include -#include #include "myheader.h" #include "vector.h" #include "print.h" @@ -39,21 +39,17 @@ #include #include "banner.h" -#ifndef PATH_MAX -#define PATH_MAX FILENAME_MAX -#endif - /* ----------------------------------------------------------------- */ -listVector* readSimplicialComplex(char* fileName, int* numOfNodes) { +listVector* readSimplicialComplex(char* inpFileName, int* numOfNodes) { int i,j,numOfFaces,sizeOfFace; listVector *basis, *endBasis; vector b; FILE *in; setbuf(stdout,0); - if (!(in = fopen(fileName,"r"))) { + if (!(in = fopen(inpFileName,"r"))) { printf("Error opening file %s containing the simplicial complex.\n", - fileName); + inpFileName); exit(0); } @@ -181,7 +177,8 @@ int i,j,maxIndexFace,numOfNodes,numOfRows,numOfColumns,infoLevel; vector face, faceValues, column, levels, nodes; listVector *faces, *tmp; - char fileName[PATH_MAX],outFileName[PATH_MAX]; + const char *fileName=NULL; + char *inpFileName=NULL, *outFileName=NULL; FILE *out; int optc; @@ -217,22 +214,22 @@ printVersionInfo(); } - strcpy(fileName,argv[argc-1]); - strcat(fileName,".mod"); - strcpy(outFileName,argv[argc-1]); - strcat(outFileName,".mat"); + fileName=argv[argc-1]; + myxasprintf(&inpFileName,"%s.mod",fileName); + myxasprintf(&outFileName,"%s.mat",fileName); if (infoLevel>-1) { printf("Creating file %s.\n",outFileName); } numOfNodes=0; - faces=readSimplicialComplex(fileName,&numOfNodes); + faces=readSimplicialComplex(inpFileName,&numOfNodes); levels=faces->first; faces=faces->rest; + errno=0; if (!(out = fopen(outFileName,"w"))) { - printf("Error opening file for output."); + printf("Error opening file for output (%s).",strerror(errno)); exit (0); } @@ -272,6 +269,9 @@ fclose(out); + free(outFileName); + free(inpFileName); + return(0); } /* ----------------------------------------------------------------- */ --- a/src/util/print.c +++ b/src/util/print.c @@ -28,16 +28,13 @@ /* Co-Author: Ralf Hemmecke (data structure, code optimization) */ /* */ /*------------------------------------------------------------------ */ -#include "../banner.h" +#include +#include +#include +#include "banner.h" #include "myheader.h" #include "orbit.h" #include "vector.h" -#include -#include - -#ifndef PATH_MAX -#define PATH_MAX FILENAME_MAX -#endif /* ----------------------------------------------------------------- */ void printVersionInfo() { @@ -765,51 +762,42 @@ /* ----------------------------------------------------------------- */ void writeResult(listVector *basis, int numOfVars, char *fileName, char *basisType, int infoLevel) { - char outFileName[PATH_MAX]; + const char *infoMessage="undefined"; + const char *outExtension=""; + char *outFileName=NULL; + int noskip=1; /* Write result to screen and files. */ -if (infoLevel>0) { - printf("Writing result to files: "); -} - /* Write Graver basis file. */ - if (basisType[0]=='g') { -if (infoLevel>0) { - printf("Graver basis elements: %d\n\n",lengthListVector(basis)); -} - strcpy(outFileName,fileName); - printListVectorToFile(outFileName,basis,numOfVars); - } - - /* Write Hilbert basis file. */ - if (basisType[0]=='h') { -if (infoLevel>0) { - printf("Hilbert basis elements: %d\n\n",lengthListVector(basis)); -} - - strcpy(outFileName,fileName); - printListVectorToFile(outFileName,basis,numOfVars); - } - - /* Write Hilbert basis file of dual cone. */ - if (basisType[0]=='d') { -if (infoLevel>0) { - printf("Hilbert basis elements: %d\n\n",lengthListVector(basis)); -} - - strcpy(outFileName,fileName); - strcat(outFileName,".dual.hil"); - printListVectorToFile(outFileName,basis,numOfVars); - } - - /* Write extreme rays file. */ - if (basisType[0]=='r') { -if (infoLevel>0) { - printf("Extreme rays: %d\n\n",lengthListVector(basis)); -} - strcpy(outFileName,fileName); - strcat(outFileName,".ray"); + switch (basisType[0]) { + case 'g': /* Write Graver basis file. */ + infoMessage="Graver basis elements"; + /* outExtension=""; */ + break; + case 'h': /* Write Hilbert basis file. */ + infoMessage="Hilbert basis elements"; + /* outExtension=""; */ + break; + case 'd': /* Write Hilbert basis file of dual cone. */ + infoMessage="Hilbert basis elements"; + outExtension=".dual.hil"; + break; + case 'r': /* Write extreme rays file. */ + infoMessage="Extreme rays"; + outExtension=".ray"; + break; + default: + noskip=0; + break; + } + + if (noskip) { + if (infoLevel>0) { + printf("Writing result to files: %s: %d\n\n",infoMessage,lengthListVector(basis)); + } + myxasprintf(&outFileName,"%s%s",fileName,outExtension); printListVectorToFile(outFileName,basis,numOfVars); + free(outFileName); } return; --- a/src/util/myheader.h +++ b/src/util/myheader.h @@ -20,6 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include #include #include //#include @@ -160,3 +161,12 @@ struct listSignPatternPair* rest; } listSignPatternPair; + + +#define myxasprintf(fILEnANEpTR,fORMAT,...) { \ + errno=0; \ + if (asprintf(fILEnANEpTR,fORMAT,__VA_ARGS__) < 0) { \ + printf("Error allocating file name (%s).\n",strerror(errno)); \ + exit(0); \ + } \ + } --- a/src/util/output.c +++ b/src/util/output.c @@ -33,14 +33,9 @@ #include "print.h" #include "vector.h" #include -#include #include "banner.h" -#ifndef PATH_MAX -#define PATH_MAX FILENAME_MAX -#endif - /* ----------------------------------------------------------------- */ listVector* readListVector(int *numOfVars, char *fileName) { int numOfVectors; @@ -409,14 +404,15 @@ int i,j,x,y,z,numOfVars,numOfRows,numOfFixPoints,numOfLabels,infoLevel, degree,lowdegree,highdegree,coord,sizeOfLayer,val; char *s; - char fileName[PATH_MAX],outFileName[PATH_MAX],domFileName[PATH_MAX],symFileName[PATH_MAX], - varFileName[PATH_MAX],groFileName[PATH_MAX],costFileName[PATH_MAX]; + const char *fileName=NULL, *domFileName=NULL; + char *outFileName=NULL, *symFileName=NULL, *varFileName=NULL, + *groFileName=NULL, *costFileName=NULL; char **labels; vector v,w,fixpoints; listVector *A, *B, *C, *basis, *domBasis, *tmp, *tmpV, *symmGroup, *weights; FILE *in; int did_something = 0; - + infoLevel=standardInfoLevel; for (i=1;i-1) { printVersionInfo(); } for (i=1; ifirst; - for (i=0; ifirst=v; - tmpV=tmpV->rest; - } - symmGroup=generateSymmetryGroup(symmGroup,numOfVars); - strcat(symFileName,".full"); - printListVectorToFile(symFileName, symmGroup, numOfVars); + myxasprintf(&symFileName,"%s.sym",fileName); + symmGroup=readListVector(&numOfVars,symFileName); + + tmpV=symmGroup; + while (tmpV) { + int i; + v=tmpV->first; + for (i=0; ifirst=v; + tmpV=tmpV->rest; + } + symmGroup=generateSymmetryGroup(symmGroup,numOfVars); + myxasprintf(&symFileName,"%s.sym.full",fileName); + printListVectorToFile(symFileName, symmGroup, numOfVars); } basis=extractSymmetryRepresentatives(basis,symmGroup,numOfVars); - strcpy(outFileName,fileName); - strcat(outFileName,".rep"); + myxasprintf(&outFileName,"%s.rep",fileName); printListVectorToFile(outFileName,basis,numOfVars); printf("%d representatives found.\n",lengthListVector(basis)); } else if (strncmp(argv[i],"--dom",5)==0) { - strcpy(fileName,argv[argc-1]); + fileName=argv[argc-1]; basis=readListVector(&numOfVars,fileName); - strcpy(domFileName,argv[argc-2]); + domFileName=argv[argc-2]; domBasis=readListVector(&numOfVars,domFileName); - basis=extractNonDominatedVectors(basis,domBasis,numOfVars); - strcpy(outFileName,fileName); - strcat(outFileName,".nondom"); + basis=extractNonDominatedVectors(basis,domBasis,numOfVars); + myxasprintf(&outFileName,"%s.nondom",fileName); printListVectorToFile(outFileName,basis,numOfVars); - printf("%d non-dominated vectors found.\n", - lengthListVector(basis)); + printf("%d non-dominated vectors found.\n",lengthListVector(basis)); } else if (strncmp(argv[i],"--max",5)==0) { - strcpy(fileName,argv[argc-1]); + fileName=argv[argc-1]; basis=readListVector(&numOfVars,fileName); - strcpy(symFileName,fileName); - strcat(symFileName,".sym.full"); + myxasprintf(&symFileName,"%s.sym.full",fileName); symmGroup=readListVector(&numOfVars,symFileName); - if (symmGroup==0) { - strcpy(fileName,argv[argc-1]); + if (symmGroup==0) { + fileName=argv[argc-1]; basis=readListVector(&numOfVars,fileName); - strcpy(symFileName,fileName); - strcat(symFileName,".sym"); - symmGroup=readListVector(&numOfVars,symFileName); - - tmpV=symmGroup; - while (tmpV) { - int i; - v=tmpV->first; - for (i=0; ifirst=v; - tmpV=tmpV->rest; - } - symmGroup=generateSymmetryGroup(symmGroup,numOfVars); - strcat(symFileName,".full"); - printListVectorToFile(symFileName, symmGroup, numOfVars); - } - basis=extractMaximalNonDominatedVectors(basis,symmGroup,numOfVars); - strcpy(outFileName,fileName); - strcat(outFileName,".maxnondom"); + myxasprintf(&symFileName,"%s.sym",fileName); + symmGroup=readListVector(&numOfVars,symFileName); + + tmpV=symmGroup; + while (tmpV) { + int i; + v=tmpV->first; + for (i=0; ifirst=v; + tmpV=tmpV->rest; + } + symmGroup=generateSymmetryGroup(symmGroup,numOfVars); + myxasprintf(&symFileName,"%s.sym.full",fileName); + printListVectorToFile(symFileName, symmGroup, numOfVars); + } + basis=extractMaximalNonDominatedVectors(basis,symmGroup,numOfVars); + myxasprintf(&outFileName,"%s.maxnondom",fileName); printListVectorToFile(outFileName,basis,numOfVars); - printf("%d maximal non-dominated vectors found.\n", - lengthListVector(basis)); + printf("%d maximal non-dominated vectors found.\n",lengthListVector(basis)); } else if (strncmp(argv[i],"--exp",5)==0) { - strcpy(fileName,argv[argc-1]); + fileName=argv[argc-1]; basis=readListVector(&numOfVars,fileName); - strcpy(symFileName,fileName); - strcat(symFileName,".sym.full"); + myxasprintf(&symFileName,"%s.sym.full",fileName); symmGroup=readListVector(&numOfVars,symFileName); - if (symmGroup==0) { - strcpy(symFileName,fileName); - strcat(symFileName,".sym"); - symmGroup=readListVector(&numOfVars,symFileName); - tmpV=symmGroup; - while (tmpV) { - int i; - v=tmpV->first; - for (i=0; ifirst=v; - tmpV=tmpV->rest; - } - symmGroup=generateSymmetryGroup(symmGroup,numOfVars); + if (symmGroup==0) { + myxasprintf(&symFileName,"%s.sym",fileName); + symmGroup=readListVector(&numOfVars,symFileName); + tmpV=symmGroup; + while (tmpV) { + int i; + v=tmpV->first; + for (i=0; ifirst=v; + tmpV=tmpV->rest; + } + symmGroup=generateSymmetryGroup(symmGroup,numOfVars); } basis=expandRepresentativeIntoFullOrbits(basis,symmGroup,numOfVars,10); - strcpy(outFileName,fileName); - strcat(outFileName,".exp"); + myxasprintf(&outFileName,"%s.exp",fileName); printListVectorToFile(outFileName,basis,numOfVars); } else if (strncmp(argv[i],"--deg",5)==0) { - strcpy(fileName,argv[argc-1]); + fileName=argv[argc-1]; basis=readListVector(&numOfVars,fileName); if (argc==3) { - printL1NormOfListVector(basis,numOfVars); + printL1NormOfListVector(basis,numOfVars); } else { - if (argc==4) { - degree=atoi(argv[i+1]); - printf("degree = %d\n",degree); - strcpy(outFileName,fileName); - strcat(outFileName,".deg."); - strcat(outFileName,argv[i+1]); - printListVectorWithGivenDegreesToFile(outFileName,basis,numOfVars, - degree,degree); - } else { - lowdegree=atoi(argv[i+1]); - highdegree=atoi(argv[i+2]); - printf("degrees %d..%d\n",lowdegree,highdegree); - strcpy(outFileName,fileName); - strcat(outFileName,".deg."); - strcat(outFileName,argv[i+1]); - strcat(outFileName,"-"); - strcat(outFileName,argv[i+2]); - printListVectorWithGivenDegreesToFile(outFileName,basis,numOfVars, - lowdegree,highdegree); - } + if (argc==4) { + degree=atoi(argv[i+1]); + printf("degree = %d\n",degree); + myxasprintf(&outFileName,"%s.deg.%s",fileName,argv[i+1]); + printListVectorWithGivenDegreesToFile(outFileName,basis,numOfVars,degree,degree); + } else { + lowdegree=atoi(argv[i+1]); + highdegree=atoi(argv[i+2]); + printf("degrees %d..%d\n",lowdegree,highdegree); + myxasprintf(&outFileName,"%s.deg.%s-%s",fileName,argv[i+1],argv[i+2]); + printListVectorWithGivenDegreesToFile(outFileName,basis,numOfVars,lowdegree,highdegree); + } } - return(0); + break; } else if (strncmp(argv[i],"--sup",5)==0) { - strcpy(fileName,argv[argc-1]); + fileName=argv[argc-1]; basis=readListVector(&numOfVars,fileName); if (argc==3) { - printSupportsOfListVector(basis,numOfVars); + printSupportsOfListVector(basis,numOfVars); } else { - if (argc==4) { - degree=atoi(argv[i+1]); - printf("size of support = %d\n",degree); - strcpy(outFileName,fileName); - strcat(outFileName,".supp."); - strcat(outFileName,argv[i+1]); - printListVectorWithGivenSupportsToFile(outFileName,basis,numOfVars, - degree,degree); - } else { - lowdegree=atoi(argv[i+1]); - highdegree=atoi(argv[i+2]); - printf("sizes of support %d..%d\n",lowdegree,highdegree); - strcpy(outFileName,fileName); - strcat(outFileName,".supp."); - strcat(outFileName,argv[i+1]); - strcat(outFileName,"-"); - strcat(outFileName,argv[i+2]); - printListVectorWithGivenSupportsToFile(outFileName,basis,numOfVars, - lowdegree,highdegree); - } + if (argc==4) { + degree=atoi(argv[i+1]); + printf("size of support = %d\n",degree); + myxasprintf(&outFileName,"%s.supp.%s",fileName,argv[i+1]); + printListVectorWithGivenSupportsToFile(outFileName,basis,numOfVars,degree,degree); + } else { + lowdegree=atoi(argv[i+1]); + highdegree=atoi(argv[i+2]); + printf("sizes of support %d..%d\n",lowdegree,highdegree); + myxasprintf(&outFileName,"%s.supp.%s-%s",fileName,argv[i+1],argv[i+2]); + printListVectorWithGivenSupportsToFile(outFileName,basis,numOfVars,lowdegree,highdegree); + } } - return(0); + break; } else if (strncmp(argv[i],"--typ",5)==0) { - strcpy(fileName,argv[argc-1]); + fileName=argv[argc-1]; basis=readListVector(&numOfVars,fileName); sizeOfLayer=atoi(argv[i+1]); printTypesOfListVector(basis,sizeOfLayer,numOfVars); - return(0); + break; } else if (strncmp(argv[i],"--non",5)==0) { - strcpy(fileName,argv[argc-1]); + fileName=argv[argc-1]; basis=readListVector(&numOfVars,fileName); if (argc==3) { - printf("ERROR: You need to specify a coordinate!\n"); - exit(1); + printf("ERROR: You need to specify a coordinate!\n"); + exit(1); } else { - coord=atoi(argv[i+1]); - strcpy(outFileName,fileName); - strcat(outFileName,".nonzero."); - strcat(outFileName,argv[i+1]); - printListVectorWithGivenNonzeroEntryToFile(outFileName,basis, - numOfVars,coord); + coord=atoi(argv[i+1]); + myxasprintf(&outFileName,"%s.nonzero.%s",fileName,argv[i+1]); + printListVectorWithGivenNonzeroEntryToFile(outFileName,basis,numOfVars,coord); } - return(0); + break; } else if (strncmp(argv[i],"--AxB",5)==0) { - strcpy(fileName,argv[argc-3]); + fileName=argv[argc-3]; A=readListVector(&numOfVars,fileName); - strcpy(fileName,argv[argc-2]); + fileName=argv[argc-2]; B=readListVector(&numOfVars,fileName); v=matrixTimesVector(A,B->first,lengthListVector(A),numOfVars); C=createListVector(v); - strcpy(fileName,argv[argc-1]); + fileName=argv[argc-1]; printListVectorToFile(fileName,C,lengthListVector(A)); } else if (strncmp(argv[i],"--0-1",5)==0) { - strcpy(fileName,argv[argc-1]); + fileName=argv[argc-1]; basis=readListVector(&numOfVars,fileName); basis=extractZeroOneVectors(basis,numOfVars); - strcpy(outFileName,fileName); - strcat(outFileName,".0-1"); + myxasprintf(&outFileName,"%s.0-1",fileName); printListVectorToFile(outFileName,basis,numOfVars); } else if (strncmp(argv[i],"--3wa",5)==0) { - strcpy(fileName,argv[argc-1]); + fileName=argv[argc-1]; basis=readListVector(&numOfVars,fileName); x=atoi(argv[i+1]); y=atoi(argv[i+2]); z=atoi(argv[i+3]); - strcpy(outFileName,fileName); - strcat(outFileName,".3way"); + myxasprintf(&outFileName,"%s.3way",fileName); print3wayTables(outFileName,basis,x,y,z,numOfVars); } else if (strncmp(argv[i],"--tra",5)==0) { - strcpy(fileName,argv[argc-1]); + fileName=argv[argc-1]; basis=readListVector(&numOfVars,fileName); - strcpy(outFileName,fileName); - strcat(outFileName,".tra"); + myxasprintf(&outFileName,"%s.tra",fileName); printTransposedListVectorToFile(outFileName,basis,numOfVars); } else if (strncmp(argv[i],"--map",5)==0) { - strcpy(fileName,argv[argc-1]); + fileName=argv[argc-1]; basis=readListVector(&numOfVars,fileName); - strcpy(outFileName,fileName); - strcat(outFileName,".maple"); + myxasprintf(&outFileName,"%s.maple",fileName); printListVectorMaple(outFileName,basis,numOfVars); } else if (strncmp(argv[i],"--mac",5)==0) { - strcpy(fileName,argv[argc-1]); + fileName=argv[argc-1]; basis=readListVector(&numOfVars,fileName); - strcpy(outFileName,fileName); - strcat(outFileName,".macaulay2"); + myxasprintf(&outFileName,"%s.macaulay2",fileName); printListVectorMacaulay2(outFileName,basis,numOfVars); } else if (strncmp(argv[i],"--mat",5)==0) { - strcpy(fileName,argv[argc-1]); + fileName=argv[argc-1]; basis=readListVector(&numOfVars,fileName); - strcpy(outFileName,fileName); - strcat(outFileName,".mathematica"); + myxasprintf(&outFileName,"%s.mathematica",fileName); printListVectorMaple(outFileName,basis,numOfVars); } else if (strncmp(argv[i],"--coc",5)==0) { - strcpy(fileName,argv[argc-1]); + fileName=argv[argc-1]; basis=readListVector(&numOfVars,fileName); - strcpy(outFileName,fileName); - strcat(outFileName,".cocoa"); + myxasprintf(&outFileName,"%s.cocoa",fileName); printListVectorMaple(outFileName,basis,numOfVars); } else if (strncmp(argv[i],"--bin",5)==0) { - strcpy(fileName,argv[argc-1]); + fileName=argv[argc-1]; basis=readListVector(&numOfVars,fileName); - strcpy(outFileName,fileName); - strcat(outFileName,".bin"); + myxasprintf(&outFileName,"%s.bin",fileName); labels=0; - strcpy(varFileName,fileName); - strcat(varFileName,".vars"); + myxasprintf(&varFileName,"%s.vars",fileName); if ((in = fopen(varFileName,"r"))) { - int i; - printf("File \"%s\" found. 4ti2 will use it.\n\n",varFileName); - if (fscanf(in,"%d %d",&numOfRows, &numOfLabels)!=2 || numOfRows!=1) { + int i; + printf("File \"%s\" found. 4ti2 will use it.\n\n",varFileName); + if (fscanf(in,"%d %d",&numOfRows, &numOfLabels)!=2 || numOfRows!=1) { printf("ERROR: Unrecognised file format for \"%s\".\n", varFileName); exit(1); } - if (numOfLabels != numOfVars) { - printf("ERROR: Incorrect number of variable names in \"%s\".\n", - varFileName); + if (numOfLabels != numOfVars) { + printf("ERROR: Incorrect number of variable names in \"%s\".\n", varFileName); exit(1); - } - labels = (char **)malloc(sizeof(char*)*(numOfVars)); - for (i=0; ifirst)[i]; - basis=basis->rest; + for (i=0; ifirst)[i]; + basis=basis->rest; } printVector(v,numOfVars); } else if (strncmp(argv[i],"--sub",5)==0) { - strcpy(fileName,argv[argc-2]); + fileName=argv[argc-2]; basis=readListVector(&numOfVars,fileName); v=basis->first; - strcpy(fileName,argv[argc-1]); + fileName=argv[argc-1]; basis=readListVector(&numOfVars,fileName); - strcpy(outFileName,fileName); - strcat(outFileName,".submat"); + myxasprintf(&outFileName,"%s.submat",fileName); printSubsetOfListVectorToFile(outFileName,basis,v,numOfVars); } else if (strncmp(argv[i],"--rem",5)==0) { if (strncmp(argv[i],"--remcol",8)==0) { - /* Remove column. */ - strcpy(fileName,argv[argc-1]); + /* Remove column. */ + fileName=argv[argc-1]; basis=readListVector(&numOfVars,fileName); - coord=atoi(argv[argc-2]); - strcpy(outFileName,fileName); - strcat(outFileName,".remcol"); + coord=atoi(argv[argc-2]); + myxasprintf(&outFileName,"%s.remcol",fileName); printListVectorWithoutColumnToFile(outFileName,basis,coord,numOfVars); } } else if (strncmp(argv[i],"--sta",5)==0) { - /* Extracting those symmetries from a list of given symmetries - that keep a given list of vectors fixed. */ - strcpy(fileName,argv[argc-1]); + /* Extracting those symmetries from a list of given symmetries + that keep a given list of vectors fixed. */ + fileName=argv[argc-1]; basis=readListVector(&numOfVars,fileName); - strcpy(symFileName,argv[argc-2]); - symmGroup=readListVector(&numOfVars,symFileName); + fileName=argv[argc-2]; + symmGroup=readListVector(&numOfVars,fileName); symmGroup=extractStabilizer(basis,symmGroup,numOfVars); - strcpy(outFileName,symFileName); - strcat(outFileName,".stab"); + myxasprintf(&outFileName,"%s.stab",fileName); printListVectorToFile(outFileName,symmGroup,numOfVars); } else if (strncmp(argv[i],"--fil",5)==0) { /* Fill specified column with specified value. */ - - strcpy(fileName,argv[argc-1]); + fileName=argv[argc-1]; basis=readListVector(&numOfVars,fileName); coord=atoi(argv[argc-3]); val=atoi(argv[argc-2]); tmp=basis; while (tmp) { - (tmp->first)[coord-1]=val; - tmp=tmp->rest; + (tmp->first)[coord-1]=val; + tmp=tmp->rest; } - strcpy(outFileName,fileName); - strcat(outFileName,".fil"); + myxasprintf(&outFileName,"%s.fil",fileName); printListVectorToFile(outFileName,basis,numOfVars); } else if (strncmp(argv[i],"--add",5)==0) { /* Add column with specified value. */ - strcpy(fileName,argv[argc-1]); + fileName=argv[argc-1]; basis=readListVector(&numOfVars,fileName); - coord=atoi(argv[argc-3]); - val=atoi(argv[argc-2]); - strcpy(outFileName,fileName); - strcat(outFileName,".addcol"); - printListVectorWithAdditionalColumnToFile(outFileName,basis, - coord,val,numOfVars); + coord=atoi(argv[argc-3]); + val=atoi(argv[argc-2]); + myxasprintf(&outFileName,"%s.addcol",fileName); + printListVectorWithAdditionalColumnToFile(outFileName,basis,coord,val,numOfVars); } else if (strncmp(argv[i],"--fix",5)==0) { /* Extracting those vectors that have given coordinates x[i]=i. */ - numOfFixPoints=argc-3; fixpoints=createVector(numOfFixPoints); for (j=2;jfirst; } else { - int i; - w=createVector(numOfVars); - for (i=0;i