--- ABC2PS133a.old/abc2ps.c +++ ABC2PS133a/abc2ps.c @@ -650,7 +650,7 @@ printf ("\nSelect tunes: "); /*| gets (aaa); |*/ /*| fgets (aaa, sizeof(aaa), stdin); |*/ - getline(aaa,500,stdin); + my_getline(aaa,500,stdin); if (isblank(aaa)) break; sscanf(aaa,"%s",ccc); if (ccc[0]=='?') { --- ABC2PS133a.old/buffer.h +++ ABC2PS133a/buffer.h @@ -103,7 +103,7 @@ } - if (strlen(info.comp)) fprintf (findex, "( - %s) S\n", info.comp); + if (strlen(info.comp[0])) fprintf (findex, "( - %s) S\n", info.comp[0]); if (cfmt.withxrefs) fprintf (findex, "( [%s]) S\n", info.xref); --- ABC2PS133a.old/format.h +++ ABC2PS133a/format.h @@ -6,6 +6,7 @@ /* subroutines connected with page layout */ +#include /* ----- fontspec ----- */ void fontspec (f,name,size,box) @@ -474,13 +475,13 @@ if (vb>=4) printf ("Reading format file %s:\n", fname); printf ("%s .. ", fname); strcpy (line, ""); - getline(line, BSIZE, fp); + my_getline(line, BSIZE, fp); for (i=0;i<200;i++) { end=interpret_format_line (line,f); if (end==1) return 1; strcpy (line, ""); if (feof(fp)) return 1; - if (!getline(line, BSIZE, fp)) return 1 ; + if (!my_getline(line, BSIZE, fp)) return 1 ; } fclose (fp); return 1; --- ABC2PS133a.old/music.h +++ ABC2PS133a/music.h @@ -4126,7 +4126,7 @@ for (i=0;i<100;i++) { if (feof(fpin)) rx("EOF reached scanning text block",""); strcpy (ln, ""); - getline(ln, BSIZE, fpin); + my_getline(ln, BSIZE, fpin); ll=strlen(ln); linenum++; if ((verbose>=5) || (vb>=10) ) printf ("%3d %s \n", linenum, ln); --- ABC2PS133a.old/parse.h +++ ABC2PS133a/parse.h @@ -2347,7 +2347,7 @@ strcpy (ln, ""); if (feof(fp)) return 0; - getline(ln, BSIZE, fp); + my_getline(ln, BSIZE, fp); /*| fgets(ln, BSIZE, fp); |*/ linenum++; l=strlen(ln); --- ABC2PS133a.old/subs.h +++ ABC2PS133a/subs.h @@ -4,6 +4,8 @@ * See file abc2ps.c for details. */ +#include + /* miscellaneous subroutines */ /* ----- write_help ----- */ --- ABC2PS133a.old/util.h +++ ABC2PS133a/util.h @@ -6,6 +6,7 @@ /* low-level utilities */ +#include /* ----- error warning ----- */ void wng (msg, str) @@ -70,7 +71,7 @@ } -/* ----- getline ----- */ +/* ----- my_getline ----- */ /* * Added by jc: * This routine reads a line from fp into buf, and trims away any @@ -78,7 +79,7 @@ * returns true for CR, so this routine should work even if the input * came from a DOS system. */ -char * getline(buf,len,fp) +char * my_getline(buf,len,fp) char* buf; int len; FILE* fp; @@ -297,8 +298,7 @@ } /* ----- isblank: check for blank string ---- */ -int isblank (str) -char str[]; +int isblank (char *str) { int i; for (i=0;i