From 84b4ba3060cb7ce49f76645cc22487b2acd3b760 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sat, 25 Sep 2010 19:26:57 +0200 Subject: lemon : moved unused files to obsolete dir Signed-off-by: Frans Meulenbroeks --- recipes/lemon/files/snprintf.patch | 94 ----------------------------- recipes/obsolete/lemon/files/snprintf.patch | 94 +++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 94 deletions(-) delete mode 100644 recipes/lemon/files/snprintf.patch create mode 100644 recipes/obsolete/lemon/files/snprintf.patch (limited to 'recipes') diff --git a/recipes/lemon/files/snprintf.patch b/recipes/lemon/files/snprintf.patch deleted file mode 100644 index 5ce1324f82..0000000000 --- a/recipes/lemon/files/snprintf.patch +++ /dev/null @@ -1,94 +0,0 @@ ---- lemon.c 2004-04-24 14:59:13.000000000 +0200 -+++ lemon.c 2004-07-27 15:31:40.000000000 +0200 -@@ -1272,15 +1272,15 @@ - va_start(ap, format); - /* Prepare a prefix to be prepended to every output line */ - if( lineno>0 ){ -- sprintf(prefix,"%.*s:%d: ",PREFIXLIMIT-10,filename,lineno); -+ snprintf(prefix,sizeof prefix,"%.*s:%d: ",PREFIXLIMIT-10,filename,lineno); - }else{ -- sprintf(prefix,"%.*s: ",PREFIXLIMIT-10,filename); -+ snprintf(prefix,sizeof prefix,"%.*s: ",PREFIXLIMIT-10,filename); - } - prefixsize = strlen(prefix); - availablewidth = LINEWIDTH - prefixsize; - - /* Generate the error message */ -- vsprintf(errmsg,format,ap); -+ vsnprintf(errmsg,sizeof errmsg,format,ap); - va_end(ap); - errmsgsize = strlen(errmsg); - /* Remove trailing '\n's from the error message. */ -@@ -2675,7 +2675,7 @@ - while( cfp ){ - char buf[20]; - if( cfp->dot==cfp->rp->nrhs ){ -- sprintf(buf,"(%d)",cfp->rp->index); -+ snprintf(buf,sizeof buf,"(%d)",cfp->rp->index); - fprintf(fp," %5s ",buf); - }else{ - fprintf(fp," "); -@@ -2721,7 +2721,7 @@ - c = *cp; - *cp = 0; - path = (char *)malloc( strlen(argv0) + strlen(name) + 2 ); -- if( path ) sprintf(path,"%s/%s",argv0,name); -+ if( path ) snprintf(path,sizeof path,"%s/%s",argv0,name); - *cp = c; - }else{ - extern char *getenv(); -@@ -2734,7 +2734,7 @@ - if( cp==0 ) cp = &pathlist[strlen(pathlist)]; - c = *cp; - *cp = 0; -- sprintf(path,"%s/%s",pathlist,name); -+ snprintf(path,sizeof path,"%s/%s",pathlist,name); - *cp = c; - if( c==0 ) pathlist = ""; - else pathlist = &cp[1]; -@@ -2814,14 +2814,16 @@ - - cp = strrchr(lemp->filename,'.'); - if( cp ){ -- sprintf(buf,"%.*s.lt",(int)(cp-lemp->filename),lemp->filename); -+ snprintf(buf,sizeof buf,"%.*s.lt",(int)(cp-lemp->filename),lemp->filename); - }else{ -- sprintf(buf,"%s.lt",lemp->filename); -+ snprintf(buf,sizeof buf,"%s.lt",lemp->filename); - } - if( access(buf,004)==0 ){ - tpltname = buf; - }else if( access(templatename,004)==0 ){ - tpltname = templatename; -+ }else if( access("/usr/share/lemon/lempar.c",004)==0 ){ -+ tpltname = "/usr/share/lemon/lempar.c"; - }else{ - tpltname = pathsearch(lemp->argv0,templatename,0); - } -@@ -2833,7 +2835,7 @@ - } - in = fopen(tpltname,"r"); - if( in==0 ){ -- fprintf(stderr,"Can't open the template file \"%s\".\n",templatename); -+ fprintf(stderr,"Can't open the template file \"%s\".\n",tpltname); - lemp->errorcnt++; - return 0; - } -@@ -3447,7 +3449,7 @@ - /* Generate a table containing the symbolic name of every symbol - */ - for(i=0; insymbol; i++){ -- sprintf(line,"\"%s\",",lemp->symbols[i]->name); -+ snprintf(line,sizeof line,"\"%s\",",lemp->symbols[i]->name); - fprintf(out," %-15s",line); - if( (i&3)==3 ){ fprintf(out,"\n"); lineno++; } - } -@@ -3562,7 +3564,7 @@ - in = file_open(lemp,".h","r"); - if( in ){ - for(i=1; interminal && fgets(line,LINESIZE,in); i++){ -- sprintf(pattern,"#define %s%-30s %2d\n",prefix,lemp->symbols[i]->name,i); -+ snprintf(pattern,sizeof pattern,"#define %s%-30s %2d\n",prefix,lemp->symbols[i]->name,i); - if( strcmp(line,pattern) ) break; - } - fclose(in); diff --git a/recipes/obsolete/lemon/files/snprintf.patch b/recipes/obsolete/lemon/files/snprintf.patch new file mode 100644 index 0000000000..5ce1324f82 --- /dev/null +++ b/recipes/obsolete/lemon/files/snprintf.patch @@ -0,0 +1,94 @@ +--- lemon.c 2004-04-24 14:59:13.000000000 +0200 ++++ lemon.c 2004-07-27 15:31:40.000000000 +0200 +@@ -1272,15 +1272,15 @@ + va_start(ap, format); + /* Prepare a prefix to be prepended to every output line */ + if( lineno>0 ){ +- sprintf(prefix,"%.*s:%d: ",PREFIXLIMIT-10,filename,lineno); ++ snprintf(prefix,sizeof prefix,"%.*s:%d: ",PREFIXLIMIT-10,filename,lineno); + }else{ +- sprintf(prefix,"%.*s: ",PREFIXLIMIT-10,filename); ++ snprintf(prefix,sizeof prefix,"%.*s: ",PREFIXLIMIT-10,filename); + } + prefixsize = strlen(prefix); + availablewidth = LINEWIDTH - prefixsize; + + /* Generate the error message */ +- vsprintf(errmsg,format,ap); ++ vsnprintf(errmsg,sizeof errmsg,format,ap); + va_end(ap); + errmsgsize = strlen(errmsg); + /* Remove trailing '\n's from the error message. */ +@@ -2675,7 +2675,7 @@ + while( cfp ){ + char buf[20]; + if( cfp->dot==cfp->rp->nrhs ){ +- sprintf(buf,"(%d)",cfp->rp->index); ++ snprintf(buf,sizeof buf,"(%d)",cfp->rp->index); + fprintf(fp," %5s ",buf); + }else{ + fprintf(fp," "); +@@ -2721,7 +2721,7 @@ + c = *cp; + *cp = 0; + path = (char *)malloc( strlen(argv0) + strlen(name) + 2 ); +- if( path ) sprintf(path,"%s/%s",argv0,name); ++ if( path ) snprintf(path,sizeof path,"%s/%s",argv0,name); + *cp = c; + }else{ + extern char *getenv(); +@@ -2734,7 +2734,7 @@ + if( cp==0 ) cp = &pathlist[strlen(pathlist)]; + c = *cp; + *cp = 0; +- sprintf(path,"%s/%s",pathlist,name); ++ snprintf(path,sizeof path,"%s/%s",pathlist,name); + *cp = c; + if( c==0 ) pathlist = ""; + else pathlist = &cp[1]; +@@ -2814,14 +2814,16 @@ + + cp = strrchr(lemp->filename,'.'); + if( cp ){ +- sprintf(buf,"%.*s.lt",(int)(cp-lemp->filename),lemp->filename); ++ snprintf(buf,sizeof buf,"%.*s.lt",(int)(cp-lemp->filename),lemp->filename); + }else{ +- sprintf(buf,"%s.lt",lemp->filename); ++ snprintf(buf,sizeof buf,"%s.lt",lemp->filename); + } + if( access(buf,004)==0 ){ + tpltname = buf; + }else if( access(templatename,004)==0 ){ + tpltname = templatename; ++ }else if( access("/usr/share/lemon/lempar.c",004)==0 ){ ++ tpltname = "/usr/share/lemon/lempar.c"; + }else{ + tpltname = pathsearch(lemp->argv0,templatename,0); + } +@@ -2833,7 +2835,7 @@ + } + in = fopen(tpltname,"r"); + if( in==0 ){ +- fprintf(stderr,"Can't open the template file \"%s\".\n",templatename); ++ fprintf(stderr,"Can't open the template file \"%s\".\n",tpltname); + lemp->errorcnt++; + return 0; + } +@@ -3447,7 +3449,7 @@ + /* Generate a table containing the symbolic name of every symbol + */ + for(i=0; insymbol; i++){ +- sprintf(line,"\"%s\",",lemp->symbols[i]->name); ++ snprintf(line,sizeof line,"\"%s\",",lemp->symbols[i]->name); + fprintf(out," %-15s",line); + if( (i&3)==3 ){ fprintf(out,"\n"); lineno++; } + } +@@ -3562,7 +3564,7 @@ + in = file_open(lemp,".h","r"); + if( in ){ + for(i=1; interminal && fgets(line,LINESIZE,in); i++){ +- sprintf(pattern,"#define %s%-30s %2d\n",prefix,lemp->symbols[i]->name,i); ++ snprintf(pattern,sizeof pattern,"#define %s%-30s %2d\n",prefix,lemp->symbols[i]->name,i); + if( strcmp(line,pattern) ) break; + } + fclose(in); -- cgit 1.2.3-korg