1 --- diskdev_cmds-332.25/fsck_hfs.tproj/Makefile.lnx 2017-08-09 19:59:41.782161654 +0000
2 +++ diskdev_cmds-332.25/fsck_hfs.tproj/Makefile.lnx 2017-08-09 19:42:09.138179153 +0000
6 fsck_hfs: $(OFILES) dfalib/libdfa.a
7 - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OFILES) dfalib/libdfa.a -lbsd
8 + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OFILES) dfalib/libdfa.a # -lbsd
10 dfalib/libdfa.a: FORCE
11 $(MAKE) -C dfalib -f Makefile.lnx CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" libdfa.a
12 --- diskdev_cmds-332.25/fsck_hfs.tproj/dfalib/SVerify1.c 2017-08-09 19:59:41.818161653 +0000
13 +++ diskdev_cmds-332.25/fsck_hfs.tproj/dfalib/SVerify1.c 2017-08-09 19:48:03.398173264 +0000
15 /* Always update the last recordType, fileID and attribute name before exiting */
16 prevAttr->recordType = rec->recordType;
17 prevAttr->fileID = fileID;
18 - (void) strlcpy((char *)prevAttr->attrname, (char *)attrname, sizeof(prevAttr->attrname));
19 + (void) strncpy((char *)prevAttr->attrname, (char *)attrname, sizeof(prevAttr->attrname));
20 + ((char *)prevAttr->attrname)[sizeof(prevAttr->attrname) - 1] = 0;
25 if (extentInfo.attrname == NULL) {
28 - strlcpy(extentInfo.attrname, attrname, attrlen);
29 + strncpy(extentInfo.attrname, attrname, attrlen);
30 + extentInfo.attrname[attrlen - 1] = 0;
33 // If it's uninitialized
34 --- diskdev_cmds-332.25/include/missing.h 2017-08-09 19:59:41.822161653 +0000
35 +++ diskdev_cmds-332.25/include/missing.h 2017-08-09 19:41:34.210179734 +0000
40 -#include <bsd/string.h>
41 +//#include <bsd/string.h>
43 #define MAXBSIZE (256 * 4096)