AmendHub

--- util.c Mon Nov 18 21:28:35 2024 +++ util.c Fri Dec 27 22:17:47 2024 @@ -846,7 +846,7 @@ about(char *program_name) { VersRecHndl vers; char vers_s[255]; - char short_vers[255] = { 0 }; + char short_vers[255]; short vlen, n; if ((vers = (VersRecHndl)GetResource('vers', 1))) { @@ -1215,9 +1215,10 @@ stat(char *path, struct stat *sb) short FStat(Str255 path, struct stat *sb) { - CInfoPBRec catblock = { 0 }; + CInfoPBRec catblock; short ret; + memset(&catblock, 0, sizeof(catblock)); catblock.hFileInfo.ioNamePtr = path; ret = PBGetCatInfo(&catblock, 0); if (ret != noErr) @@ -1348,7 +1349,9 @@ copy_file_contents(short source_ref, short dest_ref) return error; buf = xmalloc(1024); - + if (buf == NULL) + return -1; + while (source_size > 0) { count = 1024; if (count > source_size) @@ -1472,43 +1475,107 @@ GetSystemSubfolder(OSType folder, bool create, short * char * gestalt_machine_type(void) { - short error; long resp; - error = Gestalt(gestaltMachineType, &resp); - if (error) + if (Gestalt(gestaltMachineType, &resp) != 0) return NULL; + switch (resp) { case gestaltClassic: - return "Macintosh 128K"; + return "128K"; case gestaltMacXL: - return "Macintosh XL"; + return "XL"; case gestaltMac512KE: - return "Macintosh 512Ke"; + return "512Ke"; case gestaltMacPlus: - return "Macintosh Plus"; + return "Plus"; case gestaltMacSE: - return "Macintosh SE"; + return "SE"; case gestaltMacII: - return "Macintosh II"; + return "II"; case gestaltMacIIx: - return "Macintosh IIx"; + return "IIx"; case gestaltMacIIcx: - return "Macintosh IIcx"; + return "IIcx"; case gestaltMacSE030: - return "Macintosh SE/30"; + return "SE/30"; case gestaltPortable: - return "Macintosh Portable"; + return "Portable"; case gestaltMacIIci: - return "Macintosh IIci"; + return "IIci"; case gestaltMacIIfx: - return "Macintosh IIfx"; + return "IIfx"; case gestaltMacClassic: - return "Macintosh Classic"; + return "Classic"; case gestaltMacIIsi: - return "Macintosh IIsi"; + return "IIsi"; case gestaltMacLC: - return "Macintosh LC"; + return "LC"; + + case 20: + return "Quadra 900"; + case 21: + return "PowerBook 170"; + case 22: + return "Quadra 700"; + case 23: + return "Classic II"; + case 24: + return "PowerBook 100"; + case 25: + return "PowerBook 140"; + case 26: + return "Quadra 950"; + case 27: + return "LC III"; + case 29: + return "PowerBook Duo 210"; + case 30: + return "Centris 650"; + case 32: + return "PowerBook Duo 230"; + case 33: + return "PowerBook 180"; + case 34: + return "PowerBook 160"; + case 35: + return "Quadra 800"; + case 36: + return "Quadra 650"; + case 37: + return "LC II"; + case 38: + return "PowerBook Duo 250"; + case 44: + return "IIvi"; + case 45: + return "Performa 600"; + case 48: + return "IIvx"; + case 49: + return "Color Classic"; + case 50: + return "PowerBook 165c"; + case 52: + return "Centris 610"; + case 53: + return "Quadra 610"; + case 54: + return "PowerBook 145"; + case 56: + return "LC 520"; + case 71: + return "PowerBook 180c"; + case 84: + return "PowerBook 165"; + case 102: + return "PowerBook Duo 280"; + case 103: + return "PowerBook Duo 280c"; + case 115: + return "PowerBook 150"; + case 122: + return "PowerBook 190"; } return NULL;