Index: /branches/eam_branches/ipp-20220316/Ohana/src/addstar/include/skycells.h =================================================================== --- /branches/eam_branches/ipp-20220316/Ohana/src/addstar/include/skycells.h (revision 42115) +++ /branches/eam_branches/ipp-20220316/Ohana/src/addstar/include/skycells.h (revision 42116) @@ -35,5 +35,5 @@ /* globals which define database info / data sources (KEEP) */ -char ImageCat[256]; +char ImageCat[512]; char GSCFILE[256]; char CATDIR[256]; Index: /branches/eam_branches/ipp-20220316/Ohana/src/addstar/src/ConfigInit_skycells.c =================================================================== --- /branches/eam_branches/ipp-20220316/Ohana/src/addstar/src/ConfigInit_skycells.c (revision 42115) +++ /branches/eam_branches/ipp-20220316/Ohana/src/addstar/src/ConfigInit_skycells.c (revision 42116) @@ -6,6 +6,6 @@ char *config, *file; - char CatdirPhotcodeFile[256]; - char MasterPhotcodeFile[256]; + char CatdirPhotcodeFile[512]; + char MasterPhotcodeFile[512]; /*** load configuration info ***/ Index: /branches/eam_branches/ipp-20220316/Ohana/src/addstar/src/ReadStarsUKIRT.c =================================================================== --- /branches/eam_branches/ipp-20220316/Ohana/src/addstar/src/ReadStarsUKIRT.c (revision 42115) +++ /branches/eam_branches/ipp-20220316/Ohana/src/addstar/src/ReadStarsUKIRT.c (revision 42116) @@ -66,5 +66,5 @@ } - char filter[80]; + char filter[50]; if (!gfits_scan (header, "FILTER", "%s", 1, filter)) { fprintf (stderr, "missing FILTER\n"); Index: /branches/eam_branches/ipp-20220316/Ohana/src/addstar/src/fakeimage.c =================================================================== --- /branches/eam_branches/ipp-20220316/Ohana/src/addstar/src/fakeimage.c (revision 42115) +++ /branches/eam_branches/ipp-20220316/Ohana/src/addstar/src/fakeimage.c (revision 42116) @@ -7,5 +7,5 @@ double Rmin, Rmax, Dmin, Dmax; double dX, dY, r, d; - char chipname[80], chipdata[256], name[80]; + char chipname[16], chipdata[256], name[117]; char *config; Image *image; @@ -67,5 +67,5 @@ for (i = 0; i < Nchips; i++) { /* this is the addstar name for the chip in the camera */ - sprintf (chipname, "CHIP.%03d", i); + snprintf (chipname, 16, "CHIP.%03d", i); ScanConfig (config, chipname, "%s", 0, chipdata); @@ -74,5 +74,5 @@ /* this is the camera-specific name of a chip */ - sprintf (name, "%s.%s", rootname, chipname); + snprintf (name, 117, "%s.%s", rootname, chipname); strcpy (image[i+1].name, name); Index: /branches/eam_branches/ipp-20220316/Ohana/src/addstar/src/getusno.c =================================================================== --- /branches/eam_branches/ipp-20220316/Ohana/src/addstar/src/getusno.c (revision 42115) +++ /branches/eam_branches/ipp-20220316/Ohana/src/addstar/src/getusno.c (revision 42116) @@ -10,5 +10,5 @@ float hours[100]; int start[100], number[100], *buffer, *buf; - char filename[128]; + char filename[300]; FILE *f; int iRA0, iRA1, iDEC0, iDEC1; Index: /branches/eam_branches/ipp-20220316/Ohana/src/addstar/src/getusnob.c =================================================================== --- /branches/eam_branches/ipp-20220316/Ohana/src/addstar/src/getusnob.c (revision 42115) +++ /branches/eam_branches/ipp-20220316/Ohana/src/addstar/src/getusnob.c (revision 42116) @@ -9,5 +9,5 @@ float hours[100]; int start[100], number[100], *buffer, *buf; - char filename[128]; + char filename[300]; FILE *f; double dec; Index: /branches/eam_branches/ipp-20220316/Ohana/src/addstar/src/loadsupercos_plates.c =================================================================== --- /branches/eam_branches/ipp-20220316/Ohana/src/addstar/src/loadsupercos_plates.c (revision 42115) +++ /branches/eam_branches/ipp-20220316/Ohana/src/addstar/src/loadsupercos_plates.c (revision 42116) @@ -77,6 +77,6 @@ image[Nimage].dMcal = 0.0; - char photname[128]; - snprintf (photname, 128, "SCOS.%s.%s", emulsion, filterID); + char photname[300]; + snprintf (photname, 300, "SCOS.%s.%s", emulsion, filterID); image[Nimage].photcode = GetPhotcodeCodebyName (photname); if (!image[Nimage].photcode) { Index: /branches/eam_branches/ipp-20220316/Ohana/src/libdvo/src/coordops.c =================================================================== --- /branches/eam_branches/ipp-20220316/Ohana/src/libdvo/src/coordops.c (revision 42115) +++ /branches/eam_branches/ipp-20220316/Ohana/src/libdvo/src/coordops.c (revision 42116) @@ -888,5 +888,5 @@ int OldAIPS; - char csys[16], ctype[16]; + char csys[16], ctype[32]; double rotate, Lambda; @@ -906,5 +906,5 @@ if (!strncmp (coords[0].ctype, "SLAT", 4)) strcpy (csys, "SLON"); if (!strcmp (csys, "NONE")) return (FALSE); - snprintf (ctype, 16, "%s-%s", csys, &coords[0].ctype[5]); + snprintf (ctype, 32, "%s-%s", csys, &coords[0].ctype[5]); gfits_modify (header, "CTYPE1", "%s", 1, ctype); } Index: /branches/eam_branches/ipp-20220316/Ohana/src/libdvo/src/skyregion_gsc.c =================================================================== --- /branches/eam_branches/ipp-20220316/Ohana/src/libdvo/src/skyregion_gsc.c (revision 42115) +++ /branches/eam_branches/ipp-20220316/Ohana/src/libdvo/src/skyregion_gsc.c (revision 42116) @@ -247,5 +247,5 @@ int i; double Rmin, Rmax, Dmin, Dmax; - char temp[80], name[80]; + char temp[50], name[80]; SkyTable *band; SkyRegion *regions; Index: /branches/eam_branches/ipp-20220316/Ohana/src/libfits/header/F_create_H.c =================================================================== --- /branches/eam_branches/ipp-20220316/Ohana/src/libfits/header/F_create_H.c (revision 42115) +++ /branches/eam_branches/ipp-20220316/Ohana/src/libfits/header/F_create_H.c (revision 42116) @@ -12,8 +12,8 @@ ALLOCATE (header[0].buffer, char, NBYTES); + bzero (header[0].buffer, NBYTES); - for (i = 0; i < NBYTES; i++) - header[0].buffer[i] = ' '; - strncpy (header[0].buffer, "END", 3); + for (i = 0; i < NBYTES; i++) header[0].buffer[i] = ' '; + strcpy (header[0].buffer, "END"); gfits_modify_alt (header, "SIMPLE", "%t", 1, header[0].simple); Index: /branches/eam_branches/ipp-20220316/Ohana/src/libfits/header/F_modify.c =================================================================== --- /branches/eam_branches/ipp-20220316/Ohana/src/libfits/header/F_modify.c (revision 42115) +++ /branches/eam_branches/ipp-20220316/Ohana/src/libfits/header/F_modify.c (revision 42116) @@ -8,5 +8,7 @@ /* this function is extremely similar to gfits_print, except it allows for changing an existing field. */ - char comment[82], string[82], data[82]; + // the output string needs to be long enough to keep the compiler from + // complaining, even though the string cannot be more than 80 chars + char comment[82], string[200], data[82]; char *p, *qe; va_list argp; @@ -14,5 +16,5 @@ va_start (argp, N); bzero (data, 82); - bzero (string, 82); + bzero (string, 200); bzero (comment, 82); @@ -51,20 +53,20 @@ /* write the numeric modes */ - if (!strcmp (mode, "%d")) { snprintf (string, 81, "%-8s= %20d / %-s ", field, va_arg (argp, int), comment); goto found_it; } - if (!strcmp (mode, "%ld")) { snprintf (string, 81, "%-8s= %20ld / %-s ", field, va_arg (argp, long), comment); goto found_it; } - if (!strcmp (mode, "%lld")) { snprintf (string, 81, "%-8s= %20lld / %-s ", field, va_arg (argp, long long), comment); goto found_it; } - if (!strcmp (mode, "%Ld")) { snprintf (string, 81, "%-8s= %20lld / %-s ", field, va_arg (argp, long long), comment); goto found_it; } - if (!strcmp (mode, "%u")) { snprintf (string, 81, "%-8s= %20u / %-s ", field, va_arg (argp, unsigned), comment); goto found_it; } - if (!strcmp (mode, "%lu")) { snprintf (string, 81, "%-8s= %20lu / %-s ", field, va_arg (argp, unsigned long), comment); goto found_it; } - if (!strcmp (mode, "%llu")) { snprintf (string, 81, "%-8s= %20llu / %-s ", field, va_arg (argp, unsigned long long), comment); goto found_it; } - if (!strcmp (mode, "%Lu")) { snprintf (string, 81, "%-8s= %20llu / %-s ", field, va_arg (argp, unsigned long long), comment); goto found_it; } - if (!strcmp (mode, "%hd")) { snprintf (string, 81, "%-8s= %20d / %-s ", field, va_arg (argp, int), comment); goto found_it; } - if (!strcmp (mode, "%f")) { snprintf (string, 81, "%-8s= %20.10f / %-s ", field, va_arg (argp, double), comment); goto found_it; } - if (!strcmp (mode, "%lf")) { snprintf (string, 81, "%-8s= %20.10f / %-s ", field, va_arg (argp, double), comment); goto found_it; } - if (!strcmp (mode, "%e")) { snprintf (string, 81, "%-8s= %20.10E / %-s ", field, va_arg (argp, double), comment); goto found_it; } - if (!strcmp (mode, "%le")) { snprintf (string, 81, "%-8s= %20.10E / %-s ", field, va_arg (argp, double), comment); goto found_it; } - if (!strcmp (mode, "%g")) { snprintf (string, 81, "%-8s= %20.10G / %-s ", field, va_arg (argp, double), comment); goto found_it; } - if (!strcmp (mode, "%lg")) { snprintf (string, 81, "%-8s= %20.10G / %-s ", field, va_arg (argp, double), comment); goto found_it; } - if (!strcmp (mode, "%jd")) { snprintf (string, 81, "%-8s= %20jd / %-s ", field, va_arg (argp, intmax_t), comment); goto found_it; } + if (!strcmp (mode, "%d")) { snprintf (string, 200, "%-8s= %20d / %-s ", field, va_arg (argp, int), comment); goto found_it; } + if (!strcmp (mode, "%ld")) { snprintf (string, 200, "%-8s= %20ld / %-s ", field, va_arg (argp, long), comment); goto found_it; } + if (!strcmp (mode, "%lld")) { snprintf (string, 200, "%-8s= %20lld / %-s ", field, va_arg (argp, long long), comment); goto found_it; } + if (!strcmp (mode, "%Ld")) { snprintf (string, 200, "%-8s= %20lld / %-s ", field, va_arg (argp, long long), comment); goto found_it; } + if (!strcmp (mode, "%u")) { snprintf (string, 200, "%-8s= %20u / %-s ", field, va_arg (argp, unsigned), comment); goto found_it; } + if (!strcmp (mode, "%lu")) { snprintf (string, 200, "%-8s= %20lu / %-s ", field, va_arg (argp, unsigned long), comment); goto found_it; } + if (!strcmp (mode, "%llu")) { snprintf (string, 200, "%-8s= %20llu / %-s ", field, va_arg (argp, unsigned long long), comment); goto found_it; } + if (!strcmp (mode, "%Lu")) { snprintf (string, 200, "%-8s= %20llu / %-s ", field, va_arg (argp, unsigned long long), comment); goto found_it; } + if (!strcmp (mode, "%hd")) { snprintf (string, 200, "%-8s= %20d / %-s ", field, va_arg (argp, int), comment); goto found_it; } + if (!strcmp (mode, "%f")) { snprintf (string, 200, "%-8s= %20.10f / %-s ", field, va_arg (argp, double), comment); goto found_it; } + if (!strcmp (mode, "%lf")) { snprintf (string, 200, "%-8s= %20.10f / %-s ", field, va_arg (argp, double), comment); goto found_it; } + if (!strcmp (mode, "%e")) { snprintf (string, 200, "%-8s= %20.10E / %-s ", field, va_arg (argp, double), comment); goto found_it; } + if (!strcmp (mode, "%le")) { snprintf (string, 200, "%-8s= %20.10E / %-s ", field, va_arg (argp, double), comment); goto found_it; } + if (!strcmp (mode, "%g")) { snprintf (string, 200, "%-8s= %20.10G / %-s ", field, va_arg (argp, double), comment); goto found_it; } + if (!strcmp (mode, "%lg")) { snprintf (string, 200, "%-8s= %20.10G / %-s ", field, va_arg (argp, double), comment); goto found_it; } + if (!strcmp (mode, "%jd")) { snprintf (string, 200, "%-8s= %20jd / %-s ", field, va_arg (argp, intmax_t), comment); goto found_it; } /* string value. Quotes must be at least 8 chars apart */ @@ -73,5 +75,5 @@ if (!ptr) goto invalid; strncpy (data, ptr, 68); - snprintf (string, 81, "%-8s= '%-8s' / %-s ", field, data, comment); + snprintf (string, 200, "%-8s= '%-8s' / %-s ", field, data, comment); goto found_it; } @@ -94,5 +96,5 @@ /* this function is extremely similar to gfits_print, except it allows for changing an existing field. */ - char comment[82], string[82], data[82]; + char comment[82], string[200], data[82]; char *p, *qs, *qe; va_list argp; @@ -100,6 +102,6 @@ va_start (argp, N); bzero (data, 82); - bzero (string, 82); bzero (comment, 82); + bzero (string, 200); if (mode[0] != '%') { @@ -139,7 +141,7 @@ if (!strcmp (mode, "%t")) { if (va_arg (argp, int)) - snprintf (string, 81, "%-8s= %18s T / %-s ", field, " ", comment); + snprintf (string, 200, "%-8s= %18s T / %-s ", field, " ", comment); else - snprintf (string, 81, "%-8s= %18s F / %-s ", field, " ", comment); + snprintf (string, 200, "%-8s= %18s F / %-s ", field, " ", comment); } @@ -149,5 +151,5 @@ if (!ptr) goto invalid; strncpy (data, ptr, 71); - snprintf (string, 81, "%-8s %-71s", field, data); + snprintf (string, 200, "%-8s %-71s", field, data); } @@ -167,5 +169,5 @@ strncpy (comment, ptr, 80); gfits_pad_ending (comment, 0x20, 82); /* comment must contain spaces to the end */ - snprintf (string, 81, "%-8s= %s / %-s", field, data, comment); + snprintf (string, 200, "%-8s= %s / %-s", field, data, comment); /* this will keep the original line, but truncate the comment */ } Index: /branches/eam_branches/ipp-20220316/Ohana/src/libfits/header/F_print.c =================================================================== --- /branches/eam_branches/ipp-20220316/Ohana/src/libfits/header/F_print.c (revision 42115) +++ /branches/eam_branches/ipp-20220316/Ohana/src/libfits/header/F_print.c (revision 42116) @@ -8,5 +8,5 @@ static char blank[] = " "; - char string[82], line[80]; + char string[200], line[80]; char *p; va_list argp; @@ -46,20 +46,20 @@ /* write the numeric modes */ - if (!strcmp (mode, "%d")) { snprintf (string, 81, "%-8s= %20d / %46s ", field, va_arg (argp, int), blank); goto found_it; } - if (!strcmp (mode, "%ld")) { snprintf (string, 81, "%-8s= %20ld / %46s ", field, va_arg (argp, long), blank); goto found_it; } - if (!strcmp (mode, "%lld")){ snprintf (string, 81, "%-8s= %20lld / %46s ", field, va_arg (argp, long long), blank); goto found_it; } - if (!strcmp (mode, "%Ld")) { snprintf (string, 81, "%-8s= %20lld / %46s ", field, va_arg (argp, long long), blank); goto found_it; } - if (!strcmp (mode, "%u")) { snprintf (string, 81, "%-8s= %20u / %46s ", field, va_arg (argp, unsigned), blank); goto found_it; } - if (!strcmp (mode, "%lu")) { snprintf (string, 81, "%-8s= %20lu / %46s ", field, va_arg (argp, unsigned long), blank); goto found_it; } - if (!strcmp (mode, "%llu")){ snprintf (string, 81, "%-8s= %20llu / %46s ", field, va_arg (argp, unsigned long long), blank); goto found_it; } - if (!strcmp (mode, "%Lu")) { snprintf (string, 81, "%-8s= %20llu / %46s ", field, va_arg (argp, unsigned long long), blank); goto found_it; } - if (!strcmp (mode, "%hd")) { snprintf (string, 81, "%-8s= %20d / %46s ", field, va_arg (argp, int), blank); goto found_it; } - if (!strcmp (mode, "%f")) { snprintf (string, 81, "%-8s= %20.10f / %46s ", field, va_arg (argp, double), blank); goto found_it; } - if (!strcmp (mode, "%lf")) { snprintf (string, 81, "%-8s= %20.10f / %46s ", field, va_arg (argp, double), blank); goto found_it; } - if (!strcmp (mode, "%e")) { snprintf (string, 81, "%-8s= %20.10E / %46s ", field, va_arg (argp, double), blank); goto found_it; } - if (!strcmp (mode, "%le")) { snprintf (string, 81, "%-8s= %20.10E / %46s ", field, va_arg (argp, double), blank); goto found_it; } - if (!strcmp (mode, "%g")) { snprintf (string, 81, "%-8s= %20.10G / %46s ", field, va_arg (argp, double), blank); goto found_it; } - if (!strcmp (mode, "%lg")) { snprintf (string, 81, "%-8s= %20.10G / %46s ", field, va_arg (argp, double), blank); goto found_it; } - if (!strcmp (mode, "%jd")) { snprintf (string, 81, "%-8s= %20jd / %46s ", field, va_arg (argp, intmax_t), blank); goto found_it; } + if (!strcmp (mode, "%d")) { snprintf (string, 200, "%-8s= %20d / %46s ", field, va_arg (argp, int), blank); goto found_it; } + if (!strcmp (mode, "%ld")) { snprintf (string, 200, "%-8s= %20ld / %46s ", field, va_arg (argp, long), blank); goto found_it; } + if (!strcmp (mode, "%lld")){ snprintf (string, 200, "%-8s= %20lld / %46s ", field, va_arg (argp, long long), blank); goto found_it; } + if (!strcmp (mode, "%Ld")) { snprintf (string, 200, "%-8s= %20lld / %46s ", field, va_arg (argp, long long), blank); goto found_it; } + if (!strcmp (mode, "%u")) { snprintf (string, 200, "%-8s= %20u / %46s ", field, va_arg (argp, unsigned), blank); goto found_it; } + if (!strcmp (mode, "%lu")) { snprintf (string, 200, "%-8s= %20lu / %46s ", field, va_arg (argp, unsigned long), blank); goto found_it; } + if (!strcmp (mode, "%llu")){ snprintf (string, 200, "%-8s= %20llu / %46s ", field, va_arg (argp, unsigned long long), blank); goto found_it; } + if (!strcmp (mode, "%Lu")) { snprintf (string, 200, "%-8s= %20llu / %46s ", field, va_arg (argp, unsigned long long), blank); goto found_it; } + if (!strcmp (mode, "%hd")) { snprintf (string, 200, "%-8s= %20d / %46s ", field, va_arg (argp, int), blank); goto found_it; } + if (!strcmp (mode, "%f")) { snprintf (string, 200, "%-8s= %20.10f / %46s ", field, va_arg (argp, double), blank); goto found_it; } + if (!strcmp (mode, "%lf")) { snprintf (string, 200, "%-8s= %20.10f / %46s ", field, va_arg (argp, double), blank); goto found_it; } + if (!strcmp (mode, "%e")) { snprintf (string, 200, "%-8s= %20.10E / %46s ", field, va_arg (argp, double), blank); goto found_it; } + if (!strcmp (mode, "%le")) { snprintf (string, 200, "%-8s= %20.10E / %46s ", field, va_arg (argp, double), blank); goto found_it; } + if (!strcmp (mode, "%g")) { snprintf (string, 200, "%-8s= %20.10G / %46s ", field, va_arg (argp, double), blank); goto found_it; } + if (!strcmp (mode, "%lg")) { snprintf (string, 200, "%-8s= %20.10G / %46s ", field, va_arg (argp, double), blank); goto found_it; } + if (!strcmp (mode, "%jd")) { snprintf (string, 200, "%-8s= %20jd / %46s ", field, va_arg (argp, intmax_t), blank); goto found_it; } /* string value. Quotes must be at least 8 chars apart. Longer lines will this should be fixed to allow arbitrary string lengths, up to 69 chars */ @@ -69,5 +69,5 @@ strcpy (line, ptr); line[68] = 0; - snprintf (string, 81, "%-8s= '%-8s' / %46s ", field, line, blank); + snprintf (string, 200, "%-8s= '%-8s' / %46s ", field, line, blank); goto found_it; } @@ -89,5 +89,5 @@ static char blank[] = " "; - char string[82], line[80]; + char string[200], line[80]; char *p, a; va_list argp; @@ -126,7 +126,7 @@ a = va_arg (argp, int); if (a == 1) - snprintf (string, 81, "%-8s= %18s T / %46s ", field, blank, blank); + snprintf (string, 200, "%-8s= %18s T / %46s ", field, blank, blank); else - snprintf (string, 81, "%-8s= %18s F / %46s ", field, blank, blank); + snprintf (string, 200, "%-8s= %18s F / %46s ", field, blank, blank); } @@ -138,5 +138,5 @@ bzero (line, 80); strncpy (line, ptr, 71); - snprintf (string, 81, "%-8s %-71s", field, line); + snprintf (string, 200, "%-8s %-71s", field, line); } Index: /branches/eam_branches/ipp-20220316/Ohana/src/libfits/table/F_create_TH.c =================================================================== --- /branches/eam_branches/ipp-20220316/Ohana/src/libfits/table/F_create_TH.c (revision 42115) +++ /branches/eam_branches/ipp-20220316/Ohana/src/libfits/table/F_create_TH.c (revision 42116) @@ -17,8 +17,8 @@ myAssert (!header->buffer, "failed to init header or free buffer?"); ALLOCATE (header[0].buffer, char, NBYTES); + bzero (header[0].buffer, NBYTES); - for (i = 0; i < NBYTES; i++) - header[0].buffer[i] = ' '; - strncpy (header[0].buffer, "END", 3); + for (i = 0; i < NBYTES; i++) header[0].buffer[i] = ' '; + strcpy (header[0].buffer, "END"); gfits_modify (header, "XTENSION", "%s", 1, type); Index: /branches/eam_branches/ipp-20220316/Ohana/src/libohana/src/findexec.c =================================================================== --- /branches/eam_branches/ipp-20220316/Ohana/src/libohana/src/findexec.c (revision 42115) +++ /branches/eam_branches/ipp-20220316/Ohana/src/libohana/src/findexec.c (revision 42116) @@ -259,5 +259,5 @@ int i, N, done, status; - char *c, *e, *dir, path[1024], name[1024]; + char *c, *e, *dir, path[1024], name[1280]; /* if given an absolute or relative path, use it */ @@ -295,5 +295,5 @@ e = strchr (c, ':'); } - snprintf (name, 1024, "%s/%s", path, argv[0]); + snprintf (name, 1080, "%s/%s", path, argv[0]); status = check_file_exec (name);