Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions system7.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -695,7 +695,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.15;
MACOSX_DEPLOYMENT_TARGET = 14.6;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
Expand Down Expand Up @@ -754,7 +754,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.15;
MACOSX_DEPLOYMENT_TARGET = 14.6;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
OTHER_LDFLAGS = "-Wl,-fatal_warnings";
Expand All @@ -772,7 +772,6 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = system7/system7.pch;
INSTALL_PATH = /bin;
MACOSX_DEPLOYMENT_TARGET = 10.14;
PRODUCT_NAME = s7;
};
name = Debug;
Expand All @@ -786,7 +785,6 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = system7/system7.pch;
INSTALL_PATH = /bin;
MACOSX_DEPLOYMENT_TARGET = 10.14;
PRODUCT_NAME = s7;
};
name = Release;
Expand All @@ -800,7 +798,6 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "system7-tests/S7Tests.pch";
INFOPLIST_FILE = "system7-tests/Info.plist";
MACOSX_DEPLOYMENT_TARGET = 12.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.readdle.system7-tests";
PRODUCT_NAME = "$(TARGET_NAME)";
};
Expand All @@ -815,7 +812,6 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "system7-tests/S7Tests.pch";
INFOPLIST_FILE = "system7-tests/Info.plist";
MACOSX_DEPLOYMENT_TARGET = 12.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.readdle.system7-tests";
PRODUCT_NAME = "$(TARGET_NAME)";
};
Expand Down
2 changes: 1 addition & 1 deletion system7/Merge Driver/S7ConfigMergeDriver.m
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ + (BOOL)readMergeResolutionFromEnvironmentVariable:(S7ConflictResolutionOption *
+ (S7ConflictResolutionOption)readConflictResolutionFromStdinWithAllowedOptions:(S7ConflictResolutionOption)allowedResolutions
prompt:(NSString *)prompt
{
const int BUF_LEN = 20;
#define BUF_LEN 20
char buf[BUF_LEN];

NSUInteger numberOfTries = 0;
Expand Down
43 changes: 28 additions & 15 deletions system7/Utils/S7Logging.m
Original file line number Diff line number Diff line change
Expand Up @@ -35,37 +35,50 @@ BOOL canUseColorForOutputToFile(int fileno) {
return isatty(fileno) && term != NULL && strcasecmp(term, "dumb") != 0;
}

char *formatMessage(const char * __restrict format, va_list *args) {
va_list args_copy;
va_copy(args_copy, *args);
const int writtenSize = vsnprintf(nil, 0, format, args_copy);
va_end(args_copy);

const size_t bufferSize = writtenSize + 1;
char *const buffer = malloc(bufferSize);
vsnprintf(buffer, bufferSize, format, *args);

return buffer;
}

void logInfo(const char * __restrict format, ...) {
va_list va_args;
va_start(va_args, format);
NSString *const nsFormat = [[NSString alloc] initWithCString:format encoding:NSUTF8StringEncoding];
NSString *const message = [[NSString alloc] initWithFormat:nsFormat arguments:va_args];
va_end(va_args);
va_list args;
va_start(args, format);
char *const message = formatMessage(format, &args);
va_end(args);

withTTYLockDo(^{
fprintf(stdout, "%s", [message cStringUsingEncoding:NSUTF8StringEncoding]);
fprintf(stdout, "%s", message);
});

free(message);
}

void logError(const char * __restrict format, ...) {
va_list va_args;
va_start(va_args, format);
NSString *const nsFormat = [[NSString alloc] initWithCString:format encoding:NSUTF8StringEncoding];
NSString *const message = [[NSString alloc] initWithFormat:nsFormat arguments:va_args];
va_end(va_args);
va_list args;
va_start(args, format);
char *const message = formatMessage(format, &args);
va_end(args);

withTTYLockDo(^{
if (canUseColorForOutputToFile(fileno(stderr))) {
fprintf(stderr,
"\033[31m"
"%s"
"\033[0m",
[message cStringUsingEncoding:NSUTF8StringEncoding]);
message);
}
else {
fprintf(stderr,
"ERROR: %s",
[message cStringUsingEncoding:NSUTF8StringEncoding]);
fprintf(stderr, "ERROR: %s", message);
}
});

free(message);
}
5 changes: 5 additions & 0 deletions system7/git/Git.m
Original file line number Diff line number Diff line change
Expand Up @@ -983,6 +983,11 @@ - (BOOL)findPackedReferenceMatchingPattern:(NSString *)pattern reference:(NSStri

BOOL found = NO;
FILE *const referencesFile = fopen(referencesFilePath.fileSystemRepresentation, "r");
if (NULL == referencesFile) {
logError("Failed to read %s\n", referencesFilePath.fileSystemRepresentation);
return NO;
}

const size_t bufferLength = 512;
char *const buffer = calloc(bufferLength, sizeof(char));

Expand Down