X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=macosx%2Fosxmain.m;h=2ac772a835aa2883b984e1214fd1cfc9f9981604;hb=9dd9860cc84f82309de64c33e2813c6e9dc60749;hp=d8202e24960cdda4949c2be01a63313f3bfc3e2f;hpb=07a876ce1e7164c40192f36a9159e9445356d3d1;p=PuTTY.git diff --git a/macosx/osxmain.m b/macosx/osxmain.m index d8202e24..2ac772a8 100644 --- a/macosx/osxmain.m +++ b/macosx/osxmain.m @@ -58,7 +58,7 @@ char *x_get_default(const char *key) return NULL; /* this is a stub */ } -static void commonfatalbox(char *p, va_list ap) +static void commonfatalbox(const char *p, va_list ap) { char errorbuf[2048]; NSAlert *alert; @@ -85,7 +85,25 @@ static void commonfatalbox(char *p, va_list ap) exit(1); } -void fatalbox(char *p, ...) +void nonfatal(void *frontend, const char *p, ...) +{ + char *errorbuf; + NSAlert *alert; + va_list ap; + + va_start(ap, p); + errorbuf = dupvprintf(p, ap); + va_end(ap); + + alert = [[[NSAlert alloc] init] autorelease]; + [alert addButtonWithTitle:@"Error"]; + [alert setInformativeText:[NSString stringWithCString:errorbuf]]; + [alert runModal]; + + sfree(errorbuf); +} + +void fatalbox(const char *p, ...) { va_list ap; va_start(ap, p); @@ -93,7 +111,7 @@ void fatalbox(char *p, ...) va_end(ap); } -void modalfatalbox(char *p, ...) +void modalfatalbox(const char *p, ...) { va_list ap; va_start(ap, p); @@ -101,7 +119,7 @@ void modalfatalbox(char *p, ...) va_end(ap); } -void cmdline_error(char *p, ...) +void cmdline_error(const char *p, ...) { va_list ap; fprintf(stderr, "%s: ", appname);