Simplify cli_main

ports/grep/nacl.patch

 diff --git a/configure b/configure
 --- a/configure
 +++ b/configure
-@@ -33768,7 +33768,6 @@ printf "%s\n" "$gl_cv_cc_uninitialized_supported" >&6; }
+@@ -33696,7 +33696,6 @@ printf "%s\n" "$gl_cv_cc_uninitialized_supported" >&6; }
      -Wattributes \
      -Wbad-function-cast \
      -Wbuiltin-macro-redefined \
 -    -Wcast-align \
      -Wchar-subscripts \
      -Wclobbered \
      -Wcomment \
-@@ -33782,7 +33781,6 @@ printf "%s\n" "$gl_cv_cc_uninitialized_supported" >&6; }
+@@ -33711,7 +33710,6 @@ printf "%s\n" "$gl_cv_cc_uninitialized_supported" >&6; }
      -Wdouble-promotion \
      -Wempty-body \
      -Wendif-labels \
 -    -Wenum-compare \
      -Wextra \
      -Wformat-contains-nul \
      -Wformat-extra-args \
-@@ -33805,14 +33803,11 @@ printf "%s\n" "$gl_cv_cc_uninitialized_supported" >&6; }
+@@ -33734,14 +33732,11 @@ printf "%s\n" "$gl_cv_cc_uninitialized_supported" >&6; }
      -Wmain \
      -Wmaybe-uninitialized \
      -Wmissing-braces \
 -    -Wmissing-declarations \
      -Wmissing-field-initializers \
      -Wmissing-include-dirs \
      -Wmissing-parameter-type \
 -    -Wmissing-prototypes \
      -Wmultichar \
      -Wnarrowing \
 -    -Wnested-externs \
      -Wnonnull \
-     -Wnormalized=nfc \
      -Wold-style-declaration \
-@@ -33838,8 +33833,6 @@ printf "%s\n" "$gl_cv_cc_uninitialized_supported" >&6; }
+     -Wold-style-definition \
+@@ -33767,8 +33762,6 @@ printf "%s\n" "$gl_cv_cc_uninitialized_supported" >&6; }
      -Wstrict-prototypes \
      -Wsuggest-attribute=const \
      -Wsuggest-attribute=format \
 -    -Wsuggest-attribute=noreturn \
 -    -Wsuggest-attribute=pure \
      -Wswitch \
      -Wswitch-default \
      -Wsync-nand \
 diff --git a/lib/error.c b/lib/error.c
 --- a/lib/error.c
 +++ b/lib/error.c
-@@ -377,9 +377,14 @@ error_at_line (int status, int errnum, const char *file_name,
+@@ -382,9 +382,14 @@ error_at_line (int status, int errnum, const char *file_name,
    __fxprintf (NULL, file_name != NULL ? "%s:%d: " : " ",
                file_name, line_number);
  #else
 +# if defined(__pnacl__)
 +  fprintf (stderr, "%s:%d: ",
 +           file_name, line_number);
 +#else
    fprintf (stderr, file_name != NULL ? "%s:%d: " : " ",
             file_name, line_number);
  #endif
 +#endif
  
    va_start (args, message);
    error_tail (status, errnum, message, args);
 diff --git a/lib/fcntl.c b/lib/fcntl.c
 --- a/lib/fcntl.c
 +++ b/lib/fcntl.c
-@@ -186,7 +186,12 @@ rpl_fcntl (int fd, int action, /* arg */...)
+@@ -202,7 +202,12 @@ rpl_fcntl (int fd, int action, /* arg */...)
        {
          int target = va_arg (arg, int);
          /* Detect invalid target; needed for cygwin 1.5.x.  */
 +        /* TODO(bradnelson): Drop once newlib has getdtablesize. */
 +#if defined(__native_client__) && defined(_NEWLIB_VERSION)
 +        if (target < 0)
 +#else
          if (target < 0 || getdtablesize () <= target)
 +#endif
            errno = EINVAL;
@@ skipping 63 matching lines @@
 +  if (idx >= set->nelem)
 +#else
    if (idx < 0 || idx >= set->nelem)
 +#endif
      return;
    --set->nelem;
    for (; idx < set->nelem; idx++)
 diff --git a/src/Makefile.in b/src/Makefile.in
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -1254,7 +1254,7 @@ clean-binPROGRAMS:
+@@ -1259,7 +1259,7 @@ clean-binPROGRAMS:
  
  grep$(EXEEXT): $(grep_OBJECTS) $(grep_DEPENDENCIES) $(EXTRA_grep_DEPENDENCIES) 
         @rm -f grep$(EXEEXT)
 -       $(AM_V_CCLD)$(LINK) $(grep_OBJECTS) $(grep_LDADD) $(LIBS)
-+       $(AM_V_CCLD)$(LINK) $(grep_OBJECTS) $(grep_LDADD) -Wl,--undefined=PSUserCreateInstance -lcli_main -lppapi_simple -lnacl_io -lppapi -lppapi_cpp -pthread $(LIBS)
++       $(AM_V_CCLD)$(LINK) $(grep_OBJECTS) $(grep_LDADD) -Wl,--undefined=PSUserCreateInstance -lcli_main -lnacl_spawn -lppapi_simple -lnacl_io -lppapi -lppapi_cpp -pthread $(LIBS)
  install-binSCRIPTS: $(bin_SCRIPTS)
         @$(NORMAL_INSTALL)
         @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
 diff --git a/src/grep.c b/src/grep.c
 --- a/src/grep.c
 +++ b/src/grep.c
-@@ -1931,7 +1931,7 @@ fgrep_to_grep_pattern (size_t len, char const *keys,
+@@ -2107,7 +2107,7 @@ fgrep_to_grep_pattern (size_t len, char const *keys,
  }
  
  int
 -main (int argc, char **argv)
 +nacl_main (int argc, char **argv)
  {
    char *keys;
    size_t keycc, oldcc, keyalloc;