From 3f2e2297b9c88a6ab5fc4bff02cf2a07ce057589 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 1 Jul 2016 01:58:58 -0400 Subject: add an extra level of indirection to main() There are certain startup tasks that we expect every git process to do. In some cases this is just to improve the quality of the program (e.g., setting up gettext()). In others it is a requirement for using certain functions in libgit.a (e.g., system_path() expects that you have called git_extract_argv0_path()). Most commands are builtins and are covered by the git.c version of main(). However, there are still a few external commands that use their own main(). Each of these has to remember to include the correct startup sequence, and we are not always consistent. Rather than just fix the inconsistencies, let's make this harder to get wrong by providing a common main() that can run this standard startup. We basically have two options to do this: - the compat/mingw.h file already does something like this by adding a #define that replaces the definition of main with a wrapper that calls mingw_startup(). The upside is that the code in each program doesn't need to be changed at all; it's rewritten on the fly by the preprocessor. The downside is that it may make debugging of the startup sequence a bit more confusing, as the preprocessor is quietly inserting new code. - the builtin functions are all of the form cmd_foo(), and git.c's main() calls them. This is much more explicit, which may make things more obvious to somebody reading the code. It's also more flexible (because of course we have to figure out _which_ cmd_foo() to call). The downside is that each of the builtins must define cmd_foo(), instead of just main(). This patch chooses the latter option, preferring the more explicit approach, even though it is more invasive. We introduce a new file common-main.c, with the "real" main. It expects to call cmd_main() from whatever other objects it is linked against. We link common-main.o against anything that links against libgit.a, since we know that such programs will need to do this setup. Note that common-main.o can't actually go inside libgit.a, as the linker would not pick up its main() function automatically (it has no callers). The rest of the patch is just adjusting all of the various external programs (mostly in t/helper) to use cmd_main(). I've provided a global declaration for cmd_main(), which means that all of the programs also need to match its signature. In particular, many functions need to switch to "const char **" instead of "char **" for argv. This effect ripples out to a few other variables and functions, as well. This makes the patch even more invasive, but the end result is much better. We should be treating argv strings as const anyway, and now all programs conform to the same signature (which also matches the way builtins are defined). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- Makefile | 17 +++++++++++++---- common-main.c | 12 ++++++++++++ credential-cache--daemon.c | 2 +- credential-cache.c | 2 +- credential-store.c | 2 +- daemon.c | 8 ++++---- fast-import.c | 4 ++-- git-compat-util.h | 2 ++ git.c | 3 +-- http-backend.c | 2 +- http-fetch.c | 2 +- http-push.c | 6 +++--- imap-send.c | 2 +- remote-curl.c | 2 +- remote-testsvn.c | 2 +- sh-i18n--envsubst.c | 2 +- shell.c | 2 +- show-index.c | 2 +- test-chmtime.c | 2 +- test-config.c | 2 +- test-ctype.c | 2 +- test-date.c | 8 ++++---- test-delta.c | 2 +- test-dump-cache-tree.c | 2 +- test-dump-split-index.c | 2 +- test-dump-untracked-cache.c | 2 +- test-fake-ssh.c | 2 +- test-genrandom.c | 2 +- test-hashmap.c | 2 +- test-index-version.c | 2 +- test-line-buffer.c | 2 +- test-match-trees.c | 2 +- test-mergesort.c | 2 +- test-mktemp.c | 2 +- test-parse-options.c | 2 +- test-path-utils.c | 4 ++-- test-prio-queue.c | 2 +- test-read-cache.c | 2 +- test-regex.c | 2 +- test-revision-walking.c | 2 +- test-run-command.c | 2 +- test-scrap-cache-tree.c | 2 +- test-sha1-array.c | 2 +- test-sha1.c | 2 +- test-sigchain.c | 2 +- test-string-list.c | 2 +- test-submodule-config.c | 6 +++--- test-subprocess.c | 2 +- test-svn-fe.c | 4 ++-- test-urlmatch-normalization.c | 2 +- test-wildmatch.c | 2 +- upload-pack.c | 6 +++--- 52 files changed, 91 insertions(+), 69 deletions(-) create mode 100644 common-main.c diff --git a/Makefile b/Makefile index e11e626d05..15f37d58e9 100644 --- a/Makefile +++ b/Makefile @@ -943,7 +943,7 @@ BUILTIN_OBJS += builtin/verify-tag.o BUILTIN_OBJS += builtin/worktree.o BUILTIN_OBJS += builtin/write-tree.o -GITLIBS = $(LIB_FILE) $(XDIFF_LIB) +GITLIBS = common-main.o $(LIB_FILE) $(XDIFF_LIB) EXTLIBS = GIT_USER_AGENT = git/$(GIT_VERSION) @@ -1572,7 +1572,15 @@ TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH)) DIFF_SQ = $(subst ','\'',$(DIFF)) PERLLIB_EXTRA_SQ = $(subst ','\'',$(PERLLIB_EXTRA)) -LIBS = $(GITLIBS) $(EXTLIBS) +# We must filter out any object files from $(GITLIBS), +# as it is typically used like: +# +# foo: foo.o $(GITLIBS) +# $(CC) $(filter %.o,$^) $(LIBS) +# +# where we use it as a dependency. Since we also pull object files +# from the dependency list, that would make each entry appear twice. +LIBS = $(filter-out %.o, $(GITLIBS)) $(EXTLIBS) BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' \ $(COMPAT_CFLAGS) @@ -1708,8 +1716,8 @@ git.sp git.s git.o: EXTRA_CPPFLAGS = \ '-DGIT_INFO_PATH="$(infodir_relative_SQ)"' git$X: git.o GIT-LDFLAGS $(BUILTIN_OBJS) $(GITLIBS) - $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) git.o \ - $(BUILTIN_OBJS) $(LIBS) + $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) \ + $(filter %.o,$^) $(LIBS) help.sp help.s help.o: common-cmds.h @@ -1902,6 +1910,7 @@ TEST_OBJS := $(patsubst test-%$X,test-%.o,$(TEST_PROGRAMS)) OBJECTS := $(LIB_OBJS) $(BUILTIN_OBJS) $(PROGRAM_OBJS) $(TEST_OBJS) \ $(XDIFF_OBJS) \ $(VCSSVN_OBJS) \ + common-main.o \ git.o ifndef NO_CURL OBJECTS += http.o http-walker.o remote-curl.o diff --git a/common-main.c b/common-main.c new file mode 100644 index 0000000000..2b96bbf436 --- /dev/null +++ b/common-main.c @@ -0,0 +1,12 @@ +#include "git-compat-util.h" + +int main(int argc, char **av) +{ + /* + * This const trickery is explained in + * 84d32bf7678259c08406571cd6ce4b7a6724dcba + */ + const char **argv = (const char **)av; + + return cmd_main(argc, argv); +} diff --git a/credential-cache--daemon.c b/credential-cache--daemon.c index 291c0fd5e9..a4bf2366ab 100644 --- a/credential-cache--daemon.c +++ b/credential-cache--daemon.c @@ -257,7 +257,7 @@ static void init_socket_directory(const char *path) free(path_copy); } -int main(int argc, const char **argv) +int cmd_main(int argc, const char **argv) { const char *socket_path; int ignore_sighup = 0; diff --git a/credential-cache.c b/credential-cache.c index 86e21de49b..cc8a6ee192 100644 --- a/credential-cache.c +++ b/credential-cache.c @@ -83,7 +83,7 @@ static void do_cache(const char *socket, const char *action, int timeout, strbuf_release(&buf); } -int main(int argc, const char **argv) +int cmd_main(int argc, const char **argv) { char *socket_path = NULL; int timeout = 900; diff --git a/credential-store.c b/credential-store.c index 57141679ab..55ca1b1334 100644 --- a/credential-store.c +++ b/credential-store.c @@ -142,7 +142,7 @@ static void lookup_credential(const struct string_list *fns, struct credential * return; /* Found credential */ } -int main(int argc, char **argv) +int cmd_main(int argc, const char **argv) { const char * const usage[] = { "git credential-store [] ", diff --git a/daemon.c b/daemon.c index 8d45c336f5..e6b86d2153 100644 --- a/daemon.c +++ b/daemon.c @@ -32,7 +32,7 @@ static const char daemon_usage[] = " [...]"; /* List of acceptable pathname prefixes */ -static char **ok_paths; +static const char **ok_paths; static int strict_paths; /* If this is set, git-daemon-export-ok is not required */ @@ -240,7 +240,7 @@ static const char *path_ok(const char *directory, struct hostinfo *hi) } if ( ok_paths && *ok_paths ) { - char **pp; + const char **pp; int pathlen = strlen(path); /* The validation is done on the paths after enter_repo @@ -1178,7 +1178,7 @@ static int serve(struct string_list *listen_addr, int listen_port, return service_loop(&socklist); } -int main(int argc, char **argv) +int cmd_main(int argc, const char **argv) { int listen_port = 0; struct string_list listen_addr = STRING_LIST_INIT_NODUP; @@ -1193,7 +1193,7 @@ int main(int argc, char **argv) git_extract_argv0_path(argv[0]); for (i = 1; i < argc; i++) { - char *arg = argv[i]; + const char *arg = argv[i]; const char *v; if (skip_prefix(arg, "--listen=", &v)) { diff --git a/fast-import.c b/fast-import.c index 9fc7093406..bd649268b2 100644 --- a/fast-import.c +++ b/fast-import.c @@ -300,7 +300,7 @@ static int failure; static FILE *pack_edges; static unsigned int show_stats = 1; static int global_argc; -static char **global_argv; +static const char **global_argv; /* Memory pools */ static size_t mem_pool_alloc = 2*1024*1024 - sizeof(struct mem_pool); @@ -3381,7 +3381,7 @@ static void parse_argv(void) read_marks(); } -int main(int argc, char **argv) +int cmd_main(int argc, const char **argv) { unsigned int i; diff --git a/git-compat-util.h b/git-compat-util.h index 1f8b5f3b1f..91e366d1dd 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -1043,3 +1043,5 @@ struct tm *git_gmtime_r(const time_t *, struct tm *); #endif #endif + +extern int cmd_main(int, const char **); diff --git a/git.c b/git.c index 968a8a4645..e2444046f5 100644 --- a/git.c +++ b/git.c @@ -630,9 +630,8 @@ static void restore_sigpipe_to_default(void) signal(SIGPIPE, SIG_DFL); } -int main(int argc, char **av) +int cmd_main(int argc, const char **argv) { - const char **argv = (const char **) av; const char *cmd; int done_help = 0; diff --git a/http-backend.c b/http-backend.c index 8870a2681e..3249652b3d 100644 --- a/http-backend.c +++ b/http-backend.c @@ -632,7 +632,7 @@ static struct service_cmd { {"POST", "/git-receive-pack$", service_rpc} }; -int main(int argc, char **argv) +int cmd_main(int argc, const char **argv) { char *method = getenv("REQUEST_METHOD"); char *dir; diff --git a/http-fetch.c b/http-fetch.c index ba3ea10670..eb559eb83b 100644 --- a/http-fetch.c +++ b/http-fetch.c @@ -6,7 +6,7 @@ static const char http_fetch_usage[] = "git http-fetch " "[-c] [-t] [-a] [-v] [--recover] [-w ref] [--stdin] commit-id url"; -int main(int argc, const char **argv) +int cmd_main(int argc, const char **argv) { struct walker *walker; int commits_on_stdin = 0; diff --git a/http-push.c b/http-push.c index bd60668707..98228a4262 100644 --- a/http-push.c +++ b/http-push.c @@ -1692,12 +1692,12 @@ static void run_request_queue(void) #endif } -int main(int argc, char **argv) +int cmd_main(int argc, const char **argv) { struct transfer_request *request; struct transfer_request *next_request; int nr_refspec = 0; - char **refspec = NULL; + const char **refspec = NULL; struct remote_lock *ref_lock = NULL; struct remote_lock *info_ref_lock = NULL; struct rev_info revs; @@ -1717,7 +1717,7 @@ int main(int argc, char **argv) argv++; for (i = 1; i < argc; i++, argv++) { - char *arg = *argv; + const char *arg = *argv; if (*arg == '-') { if (!strcmp(arg, "--all")) { diff --git a/imap-send.c b/imap-send.c index 938c691585..890e1cbb64 100644 --- a/imap-send.c +++ b/imap-send.c @@ -1494,7 +1494,7 @@ static int curl_append_msgs_to_imap(struct imap_server_conf *server, } #endif -int main(int argc, char **argv) +int cmd_main(int argc, const char **argv) { struct strbuf all_msgs = STRBUF_INIT; int total; diff --git a/remote-curl.c b/remote-curl.c index 15e48e25fb..6ebc2a0c11 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -984,7 +984,7 @@ static void parse_push(struct strbuf *buf) free(specs); } -int main(int argc, const char **argv) +int cmd_main(int argc, const char **argv) { struct strbuf buf = STRBUF_INIT; int nongit; diff --git a/remote-testsvn.c b/remote-testsvn.c index f05ff45298..32631eb14a 100644 --- a/remote-testsvn.c +++ b/remote-testsvn.c @@ -284,7 +284,7 @@ static int do_command(struct strbuf *line) return 0; } -int main(int argc, char **argv) +int cmd_main(int argc, const char **argv) { struct strbuf buf = STRBUF_INIT, url_sb = STRBUF_INIT, private_ref_sb = STRBUF_INIT, marksfilename_sb = STRBUF_INIT, diff --git a/sh-i18n--envsubst.c b/sh-i18n--envsubst.c index 2842a22d7f..e06b2c1311 100644 --- a/sh-i18n--envsubst.c +++ b/sh-i18n--envsubst.c @@ -64,7 +64,7 @@ static void note_variables (const char *string); static void subst_from_stdin (void); int -main (int argc, char *argv[]) +cmd_main (int argc, const char *argv[]) { /* Default values for command line options. */ /* unsigned short int show_variables = 0; */ diff --git a/shell.c b/shell.c index c5439a63e9..3dd7fdcfe6 100644 --- a/shell.c +++ b/shell.c @@ -138,7 +138,7 @@ static struct commands { { NULL }, }; -int main(int argc, char **argv) +int cmd_main(int argc, const char **argv) { char *prog; const char **user_argv; diff --git a/show-index.c b/show-index.c index acf8d5445a..575f9c5894 100644 --- a/show-index.c +++ b/show-index.c @@ -4,7 +4,7 @@ static const char show_index_usage[] = "git show-index"; -int main(int argc, char **argv) +int cmd_main(int argc, const char **argv) { int i; unsigned nr; diff --git a/test-chmtime.c b/test-chmtime.c index dfe8a83261..e760256406 100644 --- a/test-chmtime.c +++ b/test-chmtime.c @@ -56,7 +56,7 @@ static int timespec_arg(const char *arg, long int *set_time, int *set_eq) return 1; } -int main(int argc, char *argv[]) +int cmd_main(int argc, const char **argv) { static int verbose; diff --git a/test-config.c b/test-config.c index 6a77552210..d143cd7222 100644 --- a/test-config.c +++ b/test-config.c @@ -33,7 +33,7 @@ */ -int main(int argc, char **argv) +int cmd_main(int argc, const char **argv) { int i, val; const char *v; diff --git a/test-ctype.c b/test-ctype.c index 707a821f03..bb72c47df5 100644 --- a/test-ctype.c +++ b/test-ctype.c @@ -28,7 +28,7 @@ static int is_in(const char *s, int ch) #define LOWER "abcdefghijklmnopqrstuvwxyz" #define UPPER "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -int main(int argc, char **argv) +int cmd_main(int argc, const char **argv) { TEST_CLASS(isdigit, DIGIT); TEST_CLASS(isspace, " \n\r\t"); diff --git a/test-date.c b/test-date.c index 63f373557e..0f3cfb1721 100644 --- a/test-date.c +++ b/test-date.c @@ -5,7 +5,7 @@ static const char *usage_msg = "\n" " test-date parse [date]...\n" " test-date approxidate [date]...\n"; -static void show_dates(char **argv, struct timeval *now) +static void show_dates(const char **argv, struct timeval *now) { struct strbuf buf = STRBUF_INIT; @@ -17,7 +17,7 @@ static void show_dates(char **argv, struct timeval *now) strbuf_release(&buf); } -static void parse_dates(char **argv, struct timeval *now) +static void parse_dates(const char **argv, struct timeval *now) { struct strbuf result = STRBUF_INIT; @@ -36,7 +36,7 @@ static void parse_dates(char **argv, struct timeval *now) strbuf_release(&result); } -static void parse_approxidate(char **argv, struct timeval *now) +static void parse_approxidate(const char **argv, struct timeval *now) { for (; *argv; argv++) { time_t t; @@ -45,7 +45,7 @@ static void parse_approxidate(char **argv, struct timeval *now) } } -int main(int argc, char **argv) +int cmd_main(int argc, const char **argv) { struct timeval now; const char *x; diff --git a/test-delta.c b/test-delta.c index 4595cd6433..59937dc1be 100644 --- a/test-delta.c +++ b/test-delta.c @@ -15,7 +15,7 @@ static const char usage_str[] = "test-delta (-d|-p) "; -int main(int argc, char *argv[]) +int cmd_main(int argc, const char **argv) { int fd; struct stat st; diff --git a/test-dump-cache-tree.c b/test-dump-cache-tree.c index bb53c0aa65..44f3290258 100644 --- a/test-dump-cache-tree.c +++ b/test-dump-cache-tree.c @@ -54,7 +54,7 @@ static int dump_cache_tree(struct cache_tree *it, return errs; } -int main(int ac, char **av) +int cmd_main(int ac, const char **av) { struct index_state istate; struct cache_tree *another = cache_tree(); diff --git a/test-dump-split-index.c b/test-dump-split-index.c index 861d28c9b6..d1689248b4 100644 --- a/test-dump-split-index.c +++ b/test-dump-split-index.c @@ -7,7 +7,7 @@ static void show_bit(size_t pos, void *data) printf(" %d", (int)pos); } -int main(int ac, char **av) +int cmd_main(int ac, const char **av) { struct split_index *si; int i; diff --git a/test-dump-untracked-cache.c b/test-dump-untracked-cache.c index 0a1c285246..50112cc858 100644 --- a/test-dump-untracked-cache.c +++ b/test-dump-untracked-cache.c @@ -40,7 +40,7 @@ static void dump(struct untracked_cache_dir *ucd, struct strbuf *base) strbuf_setlen(base, len); } -int main(int ac, char **av) +int cmd_main(int ac, const char **av) { struct untracked_cache *uc; struct strbuf base = STRBUF_INIT; diff --git a/test-fake-ssh.c b/test-fake-ssh.c index 980de216e1..12beee99ad 100644 --- a/test-fake-ssh.c +++ b/test-fake-ssh.c @@ -2,7 +2,7 @@ #include "run-command.h" #include "strbuf.h" -int main(int argc, char **argv) +int cmd_main(int argc, const char **argv) { const char *trash_directory = getenv("TRASH_DIRECTORY"); struct strbuf buf = STRBUF_INIT; diff --git a/test-genrandom.c b/test-genrandom.c index 54824d0754..8d11d22d98 100644 --- a/test-genrandom.c +++ b/test-genrandom.c @@ -6,7 +6,7 @@ #include "git-compat-util.h" -int main(int argc, char *argv[]) +int cmd_main(int argc, const char **argv) { unsigned long count, next = 0; unsigned char *c; diff --git a/test-hashmap.c b/test-hashmap.c index cc2891dd97..7aa9440e27 100644 --- a/test-hashmap.c +++ b/test-hashmap.c @@ -138,7 +138,7 @@ static void perf_hashmap(unsigned int method, unsigned int rounds) * * perfhashmap method rounds -> test hashmap.[ch] performance */ -int main(int argc, char *argv[]) +int cmd_main(int argc, const char **argv) { char line[1024]; struct hashmap map; diff --git a/test-index-version.c b/test-index-version.c index 05d4699c4a..f569f6b7ef 100644 --- a/test-index-version.c +++ b/test-index-version.c @@ -1,6 +1,6 @@ #include "cache.h" -int main(int argc, char **argv) +int cmd_main(int argc, const char **argv) { struct cache_header hdr; int version; diff --git a/test-line-buffer.c b/test-line-buffer.c index 1e58f0476f..81575fe2ab 100644 --- a/test-line-buffer.c +++ b/test-line-buffer.c @@ -50,7 +50,7 @@ static void handle_line(const char *line, struct line_buffer *stdin_buf) handle_command(line, arg + 1, stdin_buf); } -int main(int argc, char *argv[]) +int cmd_main(int argc, const char **argv) { struct line_buffer stdin_buf = LINE_BUFFER_INIT; struct line_buffer file_buf = LINE_BUFFER_INIT; diff --git a/test-match-trees.c b/test-match-trees.c index 4dad7095f1..afcdc143b5 100644 --- a/test-match-trees.c +++ b/test-match-trees.c @@ -1,7 +1,7 @@ #include "cache.h" #include "tree.h" -int main(int ac, char **av) +int cmd_main(int ac, const char **av) { unsigned char hash1[20], hash2[20], shifted[20]; struct tree *one, *two; diff --git a/test-mergesort.c b/test-mergesort.c index ea3b959e94..335cf6b626 100644 --- a/test-mergesort.c +++ b/test-mergesort.c @@ -22,7 +22,7 @@ static int compare_strings(const void *a, const void *b) return strcmp(x->text, y->text); } -int main(int argc, char **argv) +int cmd_main(int argc, const char **argv) { struct line *line, *p = NULL, *lines = NULL; struct strbuf sb = STRBUF_INIT; diff --git a/test-mktemp.c b/test-mktemp.c index c8c54213a3..89d9b2f7be 100644 --- a/test-mktemp.c +++ b/test-mktemp.c @@ -3,7 +3,7 @@ */ #include "git-compat-util.h" -int main(int argc, char *argv[]) +int cmd_main(int argc, const char **argv) { if (argc != 2) usage("Expected 1 parameter defining the temporary file template"); diff --git a/test-parse-options.c b/test-parse-options.c index 2c8c8f18ed..7adae43b87 100644 --- a/test-parse-options.c +++ b/test-parse-options.c @@ -30,7 +30,7 @@ static int number_callback(const struct option *opt, const char *arg, int unset) return 0; } -int main(int argc, char **argv) +int cmd_main(int argc, const char **argv) { const char *prefix = "prefix/"; const char *usage[] = { diff --git a/test-path-utils.c b/test-path-utils.c index ba805b374c..1ebe0f750c 100644 --- a/test-path-utils.c +++ b/test-path-utils.c @@ -156,7 +156,7 @@ static struct test_data dirname_data[] = { { NULL, NULL } }; -int main(int argc, char **argv) +int cmd_main(int argc, const char **argv) { if (argc == 3 && !strcmp(argv[1], "normalize_path_copy")) { char *buf = xmallocz(strlen(argv[2])); @@ -213,7 +213,7 @@ int main(int argc, char **argv) } if (argc >= 4 && !strcmp(argv[1], "prefix_path")) { - char *prefix = argv[2]; + const char *prefix = argv[2]; int prefix_len = strlen(prefix); int nongit_ok; setup_git_directory_gently(&nongit_ok); diff --git a/test-prio-queue.c b/test-prio-queue.c index 7be72f0086..ae58fff359 100644 --- a/test-prio-queue.c +++ b/test-prio-queue.c @@ -16,7 +16,7 @@ static void show(int *v) free(v); } -int main(int argc, char **argv) +int cmd_main(int argc, const char **argv) { struct prio_queue pq = { intcmp }; diff --git a/test-read-cache.c b/test-read-cache.c index b25bcf139b..2a7990efc3 100644 --- a/test-read-cache.c +++ b/test-read-cache.c @@ -1,6 +1,6 @@ #include "cache.h" -int main (int argc, char **argv) +int cmd_main(int argc, const char **argv) { int i, cnt = 1; if (argc == 2) diff --git a/test-regex.c b/test-regex.c index 0dc598ecdc..37b7f06e55 100644 --- a/test-regex.c +++ b/test-regex.c @@ -1,6 +1,6 @@ #include "git-compat-util.h" -int main(int argc, char **argv) +int cmd_main(int argc, const char **argv) { char *pat = "[^={} \t]+"; char *str = "={}\nfred"; diff --git a/test-revision-walking.c b/test-revision-walking.c index 3d0313354b..b8e6fe1d00 100644 --- a/test-revision-walking.c +++ b/test-revision-walking.c @@ -45,7 +45,7 @@ static int run_revision_walk(void) return got_revision; } -int main(int argc, char **argv) +int cmd_main(int argc, const char **argv) { if (argc < 2) return 1; diff --git a/test-run-command.c b/test-run-command.c index 30a64a98dc..c71ea4f759 100644 --- a/test-run-command.c +++ b/test-run-command.c @@ -49,7 +49,7 @@ static int task_finished(int result, return 1; } -int main(int argc, char **argv) +int cmd_main(int argc, const char **argv) { struct child_process proc = CHILD_PROCESS_INIT; int jobs; diff --git a/test-scrap-cache-tree.c b/test-scrap-cache-tree.c index 6efee31a48..5b2fd09908 100644 --- a/test-scrap-cache-tree.c +++ b/test-scrap-cache-tree.c @@ -5,7 +5,7 @@ static struct lock_file index_lock; -int main(int ac, char **av) +int cmd_main(int ac, const char **av) { hold_locked_index(&index_lock, 1); if (read_cache() < 0) diff --git a/test-sha1-array.c b/test-sha1-array.c index 60ea1d5f14..09f7790971 100644 --- a/test-sha1-array.c +++ b/test-sha1-array.c @@ -6,7 +6,7 @@ static void print_sha1(const unsigned char sha1[20], void *data) puts(sha1_to_hex(sha1)); } -int main(int argc, char **argv) +int cmd_main(int argc, const char **argv) { struct sha1_array array = SHA1_ARRAY_INIT; struct strbuf line = STRBUF_INIT; diff --git a/test-sha1.c b/test-sha1.c index e57eae10bf..a1c13f54ec 100644 --- a/test-sha1.c +++ b/test-sha1.c @@ -1,6 +1,6 @@ #include "cache.h" -int main(int ac, char **av) +int cmd_main(int ac, const char **av) { git_SHA_CTX ctx; unsigned char sha1[20]; diff --git a/test-sigchain.c b/test-sigchain.c index e499fce60f..b71edbd442 100644 --- a/test-sigchain.c +++ b/test-sigchain.c @@ -13,7 +13,7 @@ X(two) X(three) #undef X -int main(int argc, char **argv) { +int cmd_main(int argc, const char **argv) { sigchain_push(SIGTERM, one); sigchain_push(SIGTERM, two); sigchain_push(SIGTERM, three); diff --git a/test-string-list.c b/test-string-list.c index 14bdf9d215..4a68967bd1 100644 --- a/test-string-list.c +++ b/test-string-list.c @@ -41,7 +41,7 @@ static int prefix_cb(struct string_list_item *item, void *cb_data) return starts_with(item->string, prefix); } -int main(int argc, char **argv) +int cmd_main(int argc, const char **argv) { if (argc == 5 && !strcmp(argv[1], "split")) { struct string_list list = STRING_LIST_INIT_DUP; diff --git a/test-submodule-config.c b/test-submodule-config.c index dab8c27768..2cffded116 100644 --- a/test-submodule-config.c +++ b/test-submodule-config.c @@ -2,7 +2,7 @@ #include "submodule-config.h" #include "submodule.h" -static void die_usage(int argc, char **argv, const char *msg) +static void die_usage(int argc, const char **argv, const char *msg) { fprintf(stderr, "%s\n", msg); fprintf(stderr, "Usage: %s [ ] ...\n", argv[0]); @@ -14,9 +14,9 @@ static int git_test_config(const char *var, const char *value, void *cb) return parse_submodule_config_option(var, value); } -int main(int argc, char **argv) +int cmd_main(int argc, const char **argv) { - char **arg = argv; + const char **arg = argv; int my_argc = argc; int output_url = 0; int lookup_name = 0; diff --git a/test-subprocess.c b/test-subprocess.c index 56881a0324..30c5765bfc 100644 --- a/test-subprocess.c +++ b/test-subprocess.c @@ -1,7 +1,7 @@ #include "cache.h" #include "run-command.h" -int main(int argc, char **argv) +int cmd_main(int argc, const char **argv) { struct child_process cp = CHILD_PROCESS_INIT; int nogit = 0; diff --git a/test-svn-fe.c b/test-svn-fe.c index 120ec96b0d..7667c0803f 100644 --- a/test-svn-fe.c +++ b/test-svn-fe.c @@ -11,7 +11,7 @@ static const char test_svnfe_usage[] = "test-svn-fe ( | [-d] )"; -static int apply_delta(int argc, char *argv[]) +static int apply_delta(int argc, const char **argv) { struct line_buffer preimage = LINE_BUFFER_INIT; struct line_buffer delta = LINE_BUFFER_INIT; @@ -35,7 +35,7 @@ static int apply_delta(int argc, char *argv[]) return 0; } -int main(int argc, char *argv[]) +int cmd_main(int argc, const char **argv) { if (argc == 2) { if (svndump_init(argv[1])) diff --git a/test-urlmatch-normalization.c b/test-urlmatch-normalization.c index 090bf219a7..49b6e836be 100644 --- a/test-urlmatch-normalization.c +++ b/test-urlmatch-normalization.c @@ -1,7 +1,7 @@ #include "git-compat-util.h" #include "urlmatch.h" -int main(int argc, char **argv) +int cmd_main(int argc, const char **argv) { const char usage[] = "test-urlmatch-normalization [-p | -l] | "; char *url1, *url2; diff --git a/test-wildmatch.c b/test-wildmatch.c index 578b164fe6..52be876fed 100644 --- a/test-wildmatch.c +++ b/test-wildmatch.c @@ -1,6 +1,6 @@ #include "cache.h" -int main(int argc, char **argv) +int cmd_main(int argc, const char **argv) { int i; for (i = 2; i < argc; i++) { diff --git a/upload-pack.c b/upload-pack.c index dc802a07c2..909ce68cfb 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -817,9 +817,9 @@ static int upload_pack_config(const char *var, const char *value, void *unused) return parse_hide_refs_config(var, value, "uploadpack"); } -int main(int argc, char **argv) +int cmd_main(int argc, const char **argv) { - char *dir; + const char *dir; int i; int strict = 0; @@ -830,7 +830,7 @@ int main(int argc, char **argv) check_replace_refs = 0; for (i = 1; i < argc; i++) { - char *arg = argv[i]; + const char *arg = argv[i]; if (arg[0] != '-') break; -- cgit v1.2.3 From 650c449250d7279dcbfe2f7cc23624955d53d339 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 1 Jul 2016 02:04:04 -0400 Subject: common-main: call git_extract_argv0_path() Every program which links against libgit.a must call this function, or risk hitting an assert() in system_path() that checks whether we have configured argv0_path (though only when RUNTIME_PREFIX is defined, so essentially only on Windows). Looking at the diff, you can see that putting it into the common main() saves us having to do it individually in each of the external commands. But what you can't see are the cases where we _should_ have been doing so, but weren't (e.g., git-credential-store, and all of the t/helper test programs). This has been an accident-waiting-to-happen for a long time, but wasn't triggered until recently because it involves one of those programs actually calling system_path(). That happened with git-credential-store in v2.8.0 with ae5f677 (lazily load core.sharedrepository, 2016-03-11). The program: - takes a lock file, which... - opens a tempfile, which... - calls adjust_shared_perm to fix permissions, which... - lazy-loads the config (as of ae5f677), which... - calls system_path() to find the location of /etc/gitconfig On systems with RUNTIME_PREFIX, this means credential-store reliably hits that assert() and cannot be used. We never noticed in the test suite, because we set GIT_CONFIG_NOSYSTEM there, which skips the system_path() lookup entirely. But if we were to tweak git_config() to find /etc/gitconfig even when we aren't going to open it, then the test suite shows multiple failures (for credential-store, and for some other test helpers). I didn't include that tweak here because it's way too specific to this particular call to be worth carrying around what is essentially dead code. The implementation is fairly straightforward, with one exception: there is exactly one caller (git.c) that actually cares about the result of the function, and not the side-effect of setting up argv0_path. We can accommodate that by simply replacing the value of argv[0] in the array we hand down to cmd_main(). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- common-main.c | 3 +++ daemon.c | 3 --- fast-import.c | 3 --- git.c | 2 +- http-backend.c | 1 - http-fetch.c | 2 -- http-push.c | 2 -- imap-send.c | 2 -- remote-curl.c | 1 - remote-testsvn.c | 1 - shell.c | 2 -- upload-pack.c | 1 - 12 files changed, 4 insertions(+), 19 deletions(-) diff --git a/common-main.c b/common-main.c index 2b96bbf436..57c912a78e 100644 --- a/common-main.c +++ b/common-main.c @@ -1,4 +1,5 @@ #include "git-compat-util.h" +#include "exec_cmd.h" int main(int argc, char **av) { @@ -8,5 +9,7 @@ int main(int argc, char **av) */ const char **argv = (const char **)av; + argv[0] = git_extract_argv0_path(argv[0]); + return cmd_main(argc, argv); } diff --git a/daemon.c b/daemon.c index e6b86d2153..f2bc7f43f6 100644 --- a/daemon.c +++ b/daemon.c @@ -1,6 +1,5 @@ #include "cache.h" #include "pkt-line.h" -#include "exec_cmd.h" #include "run-command.h" #include "strbuf.h" #include "string-list.h" @@ -1190,8 +1189,6 @@ int cmd_main(int argc, const char **argv) git_setup_gettext(); - git_extract_argv0_path(argv[0]); - for (i = 1; i < argc; i++) { const char *arg = argv[i]; const char *v; diff --git a/fast-import.c b/fast-import.c index bd649268b2..72d209c19a 100644 --- a/fast-import.c +++ b/fast-import.c @@ -164,7 +164,6 @@ Format of STDIN stream: #include "refs.h" #include "csum-file.h" #include "quote.h" -#include "exec_cmd.h" #include "dir.h" #define PACK_ID_BITS 16 @@ -3385,8 +3384,6 @@ int cmd_main(int argc, const char **argv) { unsigned int i; - git_extract_argv0_path(argv[0]); - git_setup_gettext(); if (argc == 2 && !strcmp(argv[1], "-h")) diff --git a/git.c b/git.c index e2444046f5..3b4e12d7c6 100644 --- a/git.c +++ b/git.c @@ -635,7 +635,7 @@ int cmd_main(int argc, const char **argv) const char *cmd; int done_help = 0; - cmd = git_extract_argv0_path(argv[0]); + cmd = argv[0]; if (!cmd) cmd = "git-help"; diff --git a/http-backend.c b/http-backend.c index 3249652b3d..2926d1f9e7 100644 --- a/http-backend.c +++ b/http-backend.c @@ -642,7 +642,6 @@ int cmd_main(int argc, const char **argv) git_setup_gettext(); - git_extract_argv0_path(argv[0]); set_die_routine(die_webcgi); set_die_is_recursing_routine(die_webcgi_recursing); diff --git a/http-fetch.c b/http-fetch.c index eb559eb83b..244cd0db5d 100644 --- a/http-fetch.c +++ b/http-fetch.c @@ -24,8 +24,6 @@ int cmd_main(int argc, const char **argv) git_setup_gettext(); - git_extract_argv0_path(argv[0]); - while (arg < argc && argv[arg][0] == '-') { if (argv[arg][1] == 't') { get_tree = 1; diff --git a/http-push.c b/http-push.c index 98228a4262..acfcd1f1ad 100644 --- a/http-push.c +++ b/http-push.c @@ -1711,8 +1711,6 @@ int cmd_main(int argc, const char **argv) git_setup_gettext(); - git_extract_argv0_path(argv[0]); - repo = xcalloc(1, sizeof(*repo)); argv++; diff --git a/imap-send.c b/imap-send.c index 890e1cbb64..125b2183a7 100644 --- a/imap-send.c +++ b/imap-send.c @@ -1500,8 +1500,6 @@ int cmd_main(int argc, const char **argv) int total; int nongit_ok; - git_extract_argv0_path(argv[0]); - git_setup_gettext(); setup_git_directory_gently(&nongit_ok); diff --git a/remote-curl.c b/remote-curl.c index 6ebc2a0c11..cdbaed1479 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -991,7 +991,6 @@ int cmd_main(int argc, const char **argv) git_setup_gettext(); - git_extract_argv0_path(argv[0]); setup_git_directory_gently(&nongit); if (argc < 2) { error("remote-curl: usage: git remote-curl []"); diff --git a/remote-testsvn.c b/remote-testsvn.c index 32631eb14a..f87bf851ba 100644 --- a/remote-testsvn.c +++ b/remote-testsvn.c @@ -292,7 +292,6 @@ int cmd_main(int argc, const char **argv) static struct remote *remote; const char *url_in; - git_extract_argv0_path(argv[0]); setup_git_directory(); if (argc < 2 || argc > 3) { usage("git-remote-svn []"); diff --git a/shell.c b/shell.c index 3dd7fdcfe6..ca00807d7e 100644 --- a/shell.c +++ b/shell.c @@ -147,8 +147,6 @@ int cmd_main(int argc, const char **argv) git_setup_gettext(); - git_extract_argv0_path(argv[0]); - /* * Always open file descriptors 0/1/2 to avoid clobbering files * in die(). It also avoids messing up when the pipes are dup'ed diff --git a/upload-pack.c b/upload-pack.c index 909ce68cfb..8f2dd7d49a 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -826,7 +826,6 @@ int cmd_main(int argc, const char **argv) git_setup_gettext(); packet_trace_identity("upload-pack"); - git_extract_argv0_path(argv[0]); check_replace_refs = 0; for (i = 1; i < argc; i++) { -- cgit v1.2.3 From 57f5d52a942e8bbfa82e2741faf050de0d6b3eb3 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 1 Jul 2016 02:06:02 -0400 Subject: common-main: call sanitize_stdfds() This is setup that should be done in every program for safety, but we never got around to adding it everywhere (so builtins benefited from the call in git.c, but any external commands did not). Putting it in the common main() gives us this safety everywhere. Note that the case in daemon.c is a little funny. We wait until we know whether we want to daemonize, and then either: - call daemonize(), which will close stdio and reopen it to /dev/null under the hood - sanitize_stdfds(), to fix up any odd cases But that is way too late; the point of sanitizing is to give us reliable descriptors on 0/1/2, and we will already have executed code, possibly called die(), etc. The sanitizing should be the very first thing that happens. With this patch, git-daemon will sanitize first, and can remove the call in the non-daemonize case. It does mean that daemonize() may just end up closing the descriptors we opened, but that's not a big deal (it's not wrong to do so, nor is it really less optimal than the case where our parent process redirected us from /dev/null ahead of time). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- common-main.c | 9 ++++++++- daemon.c | 3 +-- git.c | 7 ------- shell.c | 7 ------- 4 files changed, 9 insertions(+), 17 deletions(-) diff --git a/common-main.c b/common-main.c index 57c912a78e..353c6ea175 100644 --- a/common-main.c +++ b/common-main.c @@ -1,4 +1,4 @@ -#include "git-compat-util.h" +#include "cache.h" #include "exec_cmd.h" int main(int argc, char **av) @@ -9,6 +9,13 @@ int main(int argc, char **av) */ const char **argv = (const char **)av; + /* + * Always open file descriptors 0/1/2 to avoid clobbering files + * in die(). It also avoids messing up when the pipes are dup'ed + * onto stdin/stdout/stderr in the child processes we spawn. + */ + sanitize_stdfds(); + argv[0] = git_extract_argv0_path(argv[0]); return cmd_main(argc, argv); diff --git a/daemon.c b/daemon.c index f2bc7f43f6..981338414e 100644 --- a/daemon.c +++ b/daemon.c @@ -1364,8 +1364,7 @@ int cmd_main(int argc, const char **argv) if (detach) { if (daemonize()) die("--detach not supported on this platform"); - } else - sanitize_stdfds(); + } if (pid_file) write_file(pid_file, "%"PRIuMAX, (uintmax_t) getpid()); diff --git a/git.c b/git.c index 3b4e12d7c6..b65083ca97 100644 --- a/git.c +++ b/git.c @@ -639,13 +639,6 @@ int cmd_main(int argc, const char **argv) if (!cmd) cmd = "git-help"; - /* - * Always open file descriptors 0/1/2 to avoid clobbering files - * in die(). It also avoids messing up when the pipes are dup'ed - * onto stdin/stdout/stderr in the child processes we spawn. - */ - sanitize_stdfds(); - restore_sigpipe_to_default(); git_setup_gettext(); diff --git a/shell.c b/shell.c index ca00807d7e..5e70acb9a6 100644 --- a/shell.c +++ b/shell.c @@ -147,13 +147,6 @@ int cmd_main(int argc, const char **argv) git_setup_gettext(); - /* - * Always open file descriptors 0/1/2 to avoid clobbering files - * in die(). It also avoids messing up when the pipes are dup'ed - * onto stdin/stdout/stderr in the child processes we spawn. - */ - sanitize_stdfds(); - /* * Special hack to pretend to be a CVS server */ -- cgit v1.2.3 From 12e0437f237ad72df3a2f3f8b067cf8097d792f1 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 1 Jul 2016 02:06:35 -0400 Subject: common-main: call restore_sigpipe_to_default() This is another safety/sanity setup that should be in force everywhere, but which we only applied in git.c. This did catch most cases, since even external commands are typically run via "git ..." (and the restoration applies to sub-processes, too). But there were cases we missed, such as somebody calling git-upload-pack directly via ssh, or scripts which use dashed external commands directly. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- common-main.c | 23 +++++++++++++++++++++++ git.c | 23 ----------------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/common-main.c b/common-main.c index 353c6ea175..20e55ef7d7 100644 --- a/common-main.c +++ b/common-main.c @@ -1,6 +1,27 @@ #include "cache.h" #include "exec_cmd.h" +/* + * Many parts of Git have subprograms communicate via pipe, expect the + * upstream of a pipe to die with SIGPIPE when the downstream of a + * pipe does not need to read all that is written. Some third-party + * programs that ignore or block SIGPIPE for their own reason forget + * to restore SIGPIPE handling to the default before spawning Git and + * break this carefully orchestrated machinery. + * + * Restore the way SIGPIPE is handled to default, which is what we + * expect. + */ +static void restore_sigpipe_to_default(void) +{ + sigset_t unblock; + + sigemptyset(&unblock); + sigaddset(&unblock, SIGPIPE); + sigprocmask(SIG_UNBLOCK, &unblock, NULL); + signal(SIGPIPE, SIG_DFL); +} + int main(int argc, char **av) { /* @@ -18,5 +39,7 @@ int main(int argc, char **av) argv[0] = git_extract_argv0_path(argv[0]); + restore_sigpipe_to_default(); + return cmd_main(argc, argv); } diff --git a/git.c b/git.c index b65083ca97..ccb24fd26a 100644 --- a/git.c +++ b/git.c @@ -609,27 +609,6 @@ static int run_argv(int *argcp, const char ***argv) return done_alias; } -/* - * Many parts of Git have subprograms communicate via pipe, expect the - * upstream of a pipe to die with SIGPIPE when the downstream of a - * pipe does not need to read all that is written. Some third-party - * programs that ignore or block SIGPIPE for their own reason forget - * to restore SIGPIPE handling to the default before spawning Git and - * break this carefully orchestrated machinery. - * - * Restore the way SIGPIPE is handled to default, which is what we - * expect. - */ -static void restore_sigpipe_to_default(void) -{ - sigset_t unblock; - - sigemptyset(&unblock); - sigaddset(&unblock, SIGPIPE); - sigprocmask(SIG_UNBLOCK, &unblock, NULL); - signal(SIGPIPE, SIG_DFL); -} - int cmd_main(int argc, const char **argv) { const char *cmd; @@ -639,8 +618,6 @@ int cmd_main(int argc, const char **argv) if (!cmd) cmd = "git-help"; - restore_sigpipe_to_default(); - git_setup_gettext(); trace_command_performance(argv); -- cgit v1.2.3 From 5ce5f5fa5ad3de3c36fdd00df2d5c045ad1d7f04 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 1 Jul 2016 02:07:01 -0400 Subject: common-main: call git_setup_gettext() This should be part of every program, as otherwise users do not get translated error messages. However, some external commands forgot to do so (e.g., git-credential-store). This fixes them, and eliminates the repeated code in programs that did remember to use it. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- common-main.c | 2 ++ daemon.c | 2 -- fast-import.c | 2 -- git.c | 2 -- http-backend.c | 2 -- http-fetch.c | 2 -- http-push.c | 2 -- imap-send.c | 2 -- remote-curl.c | 2 -- shell.c | 2 -- show-index.c | 2 -- upload-pack.c | 2 -- 12 files changed, 2 insertions(+), 22 deletions(-) diff --git a/common-main.c b/common-main.c index 20e55ef7d7..3be5ad18e1 100644 --- a/common-main.c +++ b/common-main.c @@ -37,6 +37,8 @@ int main(int argc, char **av) */ sanitize_stdfds(); + git_setup_gettext(); + argv[0] = git_extract_argv0_path(argv[0]); restore_sigpipe_to_default(); diff --git a/daemon.c b/daemon.c index 981338414e..569997c98f 100644 --- a/daemon.c +++ b/daemon.c @@ -1187,8 +1187,6 @@ int cmd_main(int argc, const char **argv) struct credentials *cred = NULL; int i; - git_setup_gettext(); - for (i = 1; i < argc; i++) { const char *arg = argv[i]; const char *v; diff --git a/fast-import.c b/fast-import.c index 72d209c19a..c434272566 100644 --- a/fast-import.c +++ b/fast-import.c @@ -3384,8 +3384,6 @@ int cmd_main(int argc, const char **argv) { unsigned int i; - git_setup_gettext(); - if (argc == 2 && !strcmp(argv[1], "-h")) usage(fast_import_usage); diff --git a/git.c b/git.c index ccb24fd26a..0f1937fd0c 100644 --- a/git.c +++ b/git.c @@ -618,8 +618,6 @@ int cmd_main(int argc, const char **argv) if (!cmd) cmd = "git-help"; - git_setup_gettext(); - trace_command_performance(argv); /* diff --git a/http-backend.c b/http-backend.c index 2926d1f9e7..5a17bcac87 100644 --- a/http-backend.c +++ b/http-backend.c @@ -640,8 +640,6 @@ int cmd_main(int argc, const char **argv) char *cmd_arg = NULL; int i; - git_setup_gettext(); - set_die_routine(die_webcgi); set_die_is_recursing_routine(die_webcgi_recursing); diff --git a/http-fetch.c b/http-fetch.c index 244cd0db5d..3b556d6619 100644 --- a/http-fetch.c +++ b/http-fetch.c @@ -22,8 +22,6 @@ int cmd_main(int argc, const char **argv) int get_verbosely = 0; int get_recover = 0; - git_setup_gettext(); - while (arg < argc && argv[arg][0] == '-') { if (argv[arg][1] == 't') { get_tree = 1; diff --git a/http-push.c b/http-push.c index acfcd1f1ad..366794d707 100644 --- a/http-push.c +++ b/http-push.c @@ -1709,8 +1709,6 @@ int cmd_main(int argc, const char **argv) int new_refs; struct ref *ref, *local_refs; - git_setup_gettext(); - repo = xcalloc(1, sizeof(*repo)); argv++; diff --git a/imap-send.c b/imap-send.c index 125b2183a7..9cbe27fcd4 100644 --- a/imap-send.c +++ b/imap-send.c @@ -1500,8 +1500,6 @@ int cmd_main(int argc, const char **argv) int total; int nongit_ok; - git_setup_gettext(); - setup_git_directory_gently(&nongit_ok); git_imap_config(); diff --git a/remote-curl.c b/remote-curl.c index cdbaed1479..46a55d28f5 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -989,8 +989,6 @@ int cmd_main(int argc, const char **argv) struct strbuf buf = STRBUF_INIT; int nongit; - git_setup_gettext(); - setup_git_directory_gently(&nongit); if (argc < 2) { error("remote-curl: usage: git remote-curl []"); diff --git a/shell.c b/shell.c index 5e70acb9a6..464ee1a201 100644 --- a/shell.c +++ b/shell.c @@ -145,8 +145,6 @@ int cmd_main(int argc, const char **argv) struct commands *cmd; int count; - git_setup_gettext(); - /* * Special hack to pretend to be a CVS server */ diff --git a/show-index.c b/show-index.c index 575f9c5894..1ead41e211 100644 --- a/show-index.c +++ b/show-index.c @@ -11,8 +11,6 @@ int cmd_main(int argc, const char **argv) unsigned int version; static unsigned int top_index[256]; - git_setup_gettext(); - if (argc != 1) usage(show_index_usage); if (fread(top_index, 2 * 4, 1, stdin) != 1) diff --git a/upload-pack.c b/upload-pack.c index 8f2dd7d49a..f0a0fdaf71 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -823,8 +823,6 @@ int cmd_main(int argc, const char **argv) int i; int strict = 0; - git_setup_gettext(); - packet_trace_identity("upload-pack"); check_replace_refs = 0; -- cgit v1.2.3 From 08aade7080ef7955eb356c6590187be3b55dcbcd Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 1 Jul 2016 15:01:28 +0200 Subject: mingw: declare main()'s argv as const In 84d32bf (sparse: Fix mingw_main() argument number/type errors, 2013-04-27), we addressed problems identified by the 'sparse' tool where argv was declared inconsistently. The way we addressed it was by casting from the non-const version to the const-version. This patch is long overdue, fixing compat/mingw.h's declaration to make the "argv" parameter const. This also allows us to lose the "const" trickery introduced earlier to common-main.c:main(). Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- common-main.c | 8 +------- compat/mingw.h | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/common-main.c b/common-main.c index 3be5ad18e1..44a29e8b13 100644 --- a/common-main.c +++ b/common-main.c @@ -22,14 +22,8 @@ static void restore_sigpipe_to_default(void) signal(SIGPIPE, SIG_DFL); } -int main(int argc, char **av) +int main(int argc, const char **argv) { - /* - * This const trickery is explained in - * 84d32bf7678259c08406571cd6ce4b7a6724dcba - */ - const char **argv = (const char **)av; - /* * Always open file descriptors 0/1/2 to avoid clobbering files * in die(). It also avoids messing up when the pipes are dup'ed diff --git a/compat/mingw.h b/compat/mingw.h index 69bb43dc35..1ac9086a82 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -535,7 +535,7 @@ extern CRITICAL_SECTION pinfo_cs; void mingw_startup(); #define main(c,v) dummy_decl_mingw_main(); \ static int mingw_main(c,v); \ -int main(int argc, char **argv) \ +int main(int argc, const char **argv) \ { \ mingw_startup(); \ return mingw_main(__argc, (void *)__argv); \ -- cgit v1.2.3