Apple-2-SW
/
dot_clean
mirror of https://github.com/ksherlock/dot_clean.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixes

This commit is contained in:
Kelvin Sherlock 2016-08-03 06:43:23 -04:00
parent da54c738ae
commit 61a0229512
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,6 +1,6 @@
CXX = clang++
LINK.o = $(LINK.cc)
CXXFLAGS += -std=c++11
CXXFLAGS += -std=c++11 -g
dot_clean: dot_clean.o mapped_file.o

27
dot_clean.cpp
View File

@ -11,6 +11,7 @@
#include <fcntl.h>
#include <errno.h>
#include <stdlib.h>
#include <err.h>
#include <sys/types.h>
#include <dirent.h>
@ -105,7 +106,7 @@ void one_file(const std::string &data, const std::string &rsrc) noexcept try {
if (header->magicNum != APPLEDOUBLE_CIGAM || header->versionNum != 0x00020000)
if (header->magicNum != APPLEDOUBLE_MAGIC || header->versionNum != 0x00020000)
throw_not_apple_double();
if (header->numEntries * sizeof(ASEntry) + sizeof(ASHeader) > mf.size()) throw_eof();
@ -154,7 +155,8 @@ void one_file(const std::string &data, const std::string &rsrc) noexcept try {
break;
}
case AS_FINDERINFO: {
if (e.entryLength != 32) {
/* Apple now includes xattr w/ finder info */
if (e.entryLength < 32) {
fputs("Warning: Invalid Finder Info size.\n", stderr);
break;
}
@ -163,7 +165,7 @@ void one_file(const std::string &data, const std::string &rsrc) noexcept try {
if (rfd < 0) throw_errno("com.apple.ResourceFork");
defer close_fd([rfd](){ close(rfd); });
ssize_t ok = write(rfd, mf.data() + e.entryOffset, e.entryLength);
ssize_t ok = write(rfd, mf.data() + e.entryOffset, 32);
if (ok < 0) throw_errno("com.apple.FinderInfo");
//if (ok != e.entryLength) return -1;
#endif
@ -214,15 +216,18 @@ void one_dir(std::string dir) noexcept {
dirp = opendir(dir.c_str());
if (dirp) {
while ( (dp = readdir(dirp)) ) {
if (dp->d_name[0] != '.') continue;
if (dp->d_name[1] != '_') continue;
while ( (dp = readdir(dirp)) ) {
if (dp->d_name[0] != '.') continue;
if (dp->d_name[1] != '_') continue;
std::string name = dp->d_name;
one_file(dir + name.substr(2), dir + name);
std::string name = dp->d_name;
one_file(dir + name.substr(2), dir + name);
}
closedir(dirp);
} else {
warn("%s", dir.c_str());
}
closedir(dirp);
}
@ -276,4 +281,4 @@ int main(int argc, char **argv) {
for (int i = 0; i < argc; ++i) one_dir(argv[i]);
return _rv;
}
}