On 18 December 2017 at 12:49, Yoni Bettan <ybet...@redhat.com> wrote:
> * it was added on 2008 902b3d5c392bb6f48ef340ad8ecc3311705d2800
> when introduced cache-utils.[ch]
>
> * since then cache-utils.[ch] were removed but **envp was left
> behind
>
> * by the way "to be portable it is best to write main to take two
> arguments, and use the value of environ" according to
> https://www.gnu.org/software/libc/manual/html_node/Program-\
> Arguments.html#Program-Arguments
> diff --git a/ui/cocoa.m b/ui/cocoa.m
> index 330ccebf90..851a2dcd06 100644
> --- a/ui/cocoa.m
> +++ b/ui/cocoa.m
> @@ -25,7 +25,6 @@
> #include "qemu/osdep.h"
>
> #import <Cocoa/Cocoa.h>
> -#include <crt_externs.h>
>
> #include "qemu-common.h"
> #include "ui/console.h"
> @@ -1050,7 +1049,7 @@ QemuCocoaView *cocoaView;
> COCOA_DEBUG("QemuCocoaAppController: startEmulationWithArgc\n");
>
> int status;
> - status = qemu_main(argc, argv, *_NSGetEnviron());
> + status = main(argc, argv);
> exit(status);
> }
>
> @@ -1391,7 +1390,7 @@ int main (int argc, const char * argv[]) {
> !strcmp(opt, "-curses") ||
> !strcmp(opt, "-display") ||
> !strcmp(opt, "-qtest")) {
> - return qemu_main(gArgc, gArgv, *_NSGetEnviron());
> + return main(gArgc, gArgv);
> }
> }
> }
Did you test this on OSX? I'm pretty sure it will break,
because now the main() function in ui/cocoa.m will
recursively call itself, rather than calling the
function in vl.c. (Either that or it just won't
link at all because there are two main() functions.)
thanks
-- PMM
