net/git/patches/100-convert_builtin.patch

   1 --- a/Makefile
   2 +++ b/Makefile
   3 @@ -549,16 +549,7 @@ EXTRA_PROGRAMS =
   4  # ... and all the rest that could be moved out of bindir to gitexecdir
   5  PROGRAMS += $(EXTRA_PROGRAMS)
   6
   7 -PROGRAM_OBJS += credential-store.o
   8 -PROGRAM_OBJS += daemon.o
   9 -PROGRAM_OBJS += fast-import.o
  10  PROGRAM_OBJS += http-backend.o
  11 -PROGRAM_OBJS += imap-send.o
  12 -PROGRAM_OBJS += sh-i18n--envsubst.o
  13 -PROGRAM_OBJS += shell.o
  14 -PROGRAM_OBJS += show-index.o
  15 -PROGRAM_OBJS += upload-pack.o
  16 -PROGRAM_OBJS += remote-testsvn.o
  17
  18  # Binary suffix, set to .exe for Windows builds
  19  X =
  20 @@ -907,6 +898,11 @@ BUILTIN_OBJS += builtin/verify-commit.o
  21  BUILTIN_OBJS += builtin/verify-pack.o
  22  BUILTIN_OBJS += builtin/verify-tag.o
  23  BUILTIN_OBJS += builtin/write-tree.o
  24 +BUILTIN_OBJS += builtin/daemon.o
  25 +BUILTIN_OBJS += builtin/fast-import.o
  26 +BUILTIN_OBJS += builtin/imap-send.o
  27 +BUILTIN_OBJS += builtin/shell.o
  28 +BUILTIN_OBJS += builtin/upload-pack.o
  29
  30  GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
  31  EXTLIBS =
  32 @@ -1089,7 +1085,7 @@ endif
  33  EXTLIBS += -lz
  34
  35  ifndef NO_OPENSSL
  36 -       OPENSSL_LIBSSL = -lssl
  37 +       EXTLIBS += -lssl
  38         ifdef OPENSSLDIR
  39                 BASIC_CFLAGS += -I$(OPENSSLDIR)/include
  40                 OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib)
  41 @@ -1956,10 +1952,6 @@ endif
  42  git-%$X: %.o GIT-LDFLAGS $(GITLIBS)
  43         $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
  44
  45 -git-imap-send$X: imap-send.o $(IMAP_SEND_BUILDDEPS) GIT-LDFLAGS $(GITLIBS)
  46 -       $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
  47 -               $(LIBS) $(IMAP_SEND_LDFLAGS)
  48 -
  49  git-http-fetch$X: http.o http-walker.o http-fetch.o GIT-LDFLAGS $(GITLIBS)
  50         $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
  51                 $(LIBS) $(CURL_LIBCURL)
  52 @@ -2277,10 +2269,11 @@ endif
  53         bindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \
  54         execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \
  55         { test "$$bindir/" = "$$execdir/" || \
  56 -         for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \
  57 +         for p in $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \
  58                 $(RM) "$$execdir/$$p" && \
  59                 test -z "$(NO_INSTALL_HARDLINKS)$(NO_CROSS_DIRECTORY_HARDLINKS)" && \
  60                 ln "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \
  61 +               ln -s git "$$execdir/$$p" 2>/dev/null || \
  62                 cp "$$bindir/$$p" "$$execdir/$$p" || exit; \
  63           done; \
  64         } && \
  65 --- a/builtin.h
  66 +++ b/builtin.h
  67 @@ -138,5 +138,10 @@ extern int cmd_verify_pack(int argc, con
  68  extern int cmd_show_ref(int argc, const char **argv, const char *prefix);
  69  extern int cmd_pack_refs(int argc, const char **argv, const char *prefix);
  70  extern int cmd_replace(int argc, const char **argv, const char *prefix);
  71 +extern int cmd_daemon(int argc, char **argv, const char *prefix);
  72 +extern int cmd_fast_import(int argc, char **argv, const char *prefix);
  73 +extern int cmd_imap_send(int argc, char **argv, const char *prefix);
  74 +extern int cmd_shell(int argc, char **argv, const char *prefix);
  75 +extern int cmd_upload_pack(int argc, char **argv, const char *prefix);
  76
  77  #endif
  78 --- /dev/null
  79 +++ b/builtin/daemon.c
  80 @@ -0,0 +1 @@
  81 +#include "../daemon.c"
  82 --- /dev/null
  83 +++ b/builtin/fast-import.c
  84 @@ -0,0 +1 @@
  85 +#include "../fast-import.c"
  86 --- /dev/null
  87 +++ b/builtin/imap-send.c
  88 @@ -0,0 +1 @@
  89 +#include "../imap-send.c"
  90 --- /dev/null
  91 +++ b/builtin/shell.c
  92 @@ -0,0 +1 @@
  93 +#include "../shell.c"
  94 --- /dev/null
  95 +++ b/builtin/upload-pack.c
  96 @@ -0,0 +1 @@
  97 +#include "../upload-pack.c"
  98 --- a/daemon.c
  99 +++ b/daemon.c
 100 @@ -1192,7 +1192,7 @@ static int serve(struct string_list *lis
 101         return service_loop(&socklist);
 102  }
 103
 104 -int main(int argc, char **argv)
 105 +int cmd_daemon(int argc, char **argv, const char *prefix)
 106  {
 107         int listen_port = 0;
 108         struct string_list listen_addr = STRING_LIST_INIT_NODUP;
 109 @@ -1388,12 +1388,13 @@ int main(int argc, char **argv)
 110                 store_pid(pid_file);
 111
 112         /* prepare argv for serving-processes */
 113 -       cld_argv = xmalloc(sizeof (char *) * (argc + 2));
 114 -       cld_argv[0] = argv[0];  /* git-daemon */
 115 -       cld_argv[1] = "--serve";
 116 +       cld_argv = xmalloc(sizeof (char *) * (argc + 3));
 117 +       cld_argv[0] = "git";
 118 +       cld_argv[1] = argv[0];  /* daemon */
 119 +       cld_argv[2] = "--serve";
 120         for (i = 1; i < argc; ++i)
 121 -               cld_argv[i+1] = argv[i];
 122 -       cld_argv[argc+1] = NULL;
 123 +               cld_argv[i+2] = argv[i];
 124 +       cld_argv[argc+2] = NULL;
 125
 126         return serve(&listen_addr, listen_port, cred);
 127  }
 128 --- a/fast-import.c
 129 +++ b/fast-import.c
 130 @@ -3351,7 +3351,7 @@ static void parse_argv(void)
 131                 read_marks();
 132  }
 133
 134 -int main(int argc, char **argv)
 135 +int cmd_fast_import(int argc, char **argv, const char *prefix)
 136  {
 137         unsigned int i;
 138
 139 --- a/git.c
 140 +++ b/git.c
 141 @@ -311,11 +311,11 @@ static int handle_alias(int *argcp, cons
 142
 143  struct cmd_struct {
 144         const char *cmd;
 145 -       int (*fn)(int, const char **, const char *);
 146 +       int (*fn)(int, char **, const char *);
 147         int option;
 148  };
 149
 150 -static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
 151 +static int run_builtin(struct cmd_struct *p, int argc, char **argv)
 152  {
 153         int status, help;
 154         struct stat st;
 155 @@ -395,6 +395,7 @@ static struct cmd_struct commands[] = {
 156         { "config", cmd_config, RUN_SETUP_GENTLY },
 157         { "count-objects", cmd_count_objects, RUN_SETUP },
 158         { "credential", cmd_credential, RUN_SETUP_GENTLY },
 159 +       { "daemon", cmd_daemon },
 160         { "describe", cmd_describe, RUN_SETUP },
 161         { "diff", cmd_diff },
 162         { "diff-files", cmd_diff_files, RUN_SETUP | NEED_WORK_TREE },
 163 @@ -413,6 +414,7 @@ static struct cmd_struct commands[] = {
 164         { "grep", cmd_grep, RUN_SETUP_GENTLY },
 165         { "hash-object", cmd_hash_object },
 166         { "help", cmd_help },
 167 +       { "imap-send", cmd_imap_send },
 168         { "index-pack", cmd_index_pack, RUN_SETUP_GENTLY },
 169         { "init", cmd_init_db, NO_SETUP },
 170         { "init-db", cmd_init_db, NO_SETUP },
 171 @@ -461,6 +463,7 @@ static struct cmd_struct commands[] = {
 172         { "revert", cmd_revert, RUN_SETUP | NEED_WORK_TREE },
 173         { "rm", cmd_rm, RUN_SETUP },
 174         { "send-pack", cmd_send_pack, RUN_SETUP },
 175 +       { "shell", cmd_shell },
 176         { "shortlog", cmd_shortlog, RUN_SETUP_GENTLY | USE_PAGER },
 177         { "show", cmd_show, RUN_SETUP },
 178         { "show-branch", cmd_show_branch, RUN_SETUP },
 179 @@ -477,6 +480,7 @@ static struct cmd_struct commands[] = {
 180         { "update-server-info", cmd_update_server_info, RUN_SETUP },
 181         { "upload-archive", cmd_upload_archive },
 182         { "upload-archive--writer", cmd_upload_archive_writer },
 183 +       { "upload-pack", cmd_upload_pack },
 184         { "var", cmd_var, RUN_SETUP_GENTLY },
 185         { "verify-commit", cmd_verify_commit, RUN_SETUP },
 186         { "verify-pack", cmd_verify_pack },
 187 --- a/imap-send.c
 188 +++ b/imap-send.c
 189 @@ -1492,7 +1492,7 @@ static int curl_append_msgs_to_imap(stru
 190  }
 191  #endif
 192
 193 -int main(int argc, char **argv)
 194 +int cmd_imap_send(int argc, char **argv, const char *prefix)
 195  {
 196         struct strbuf all_msgs = STRBUF_INIT;
 197         int total;
 198 --- a/shell.c
 199 +++ b/shell.c
 200 @@ -138,7 +138,7 @@ static struct commands {
 201         { NULL },
 202  };
 203
 204 -int main(int argc, char **argv)
 205 +int cmd_shell(int argc, char **argv, const char *prefix)
 206  {
 207         char *prog;
 208         const char **user_argv;
 209 --- a/upload-pack.c
 210 +++ b/upload-pack.c
 211 @@ -797,7 +797,7 @@ static int upload_pack_config(const char
 212         return parse_hide_refs_config(var, value, "uploadpack");
 213  }
 214
 215 -int main(int argc, char **argv)
 216 +int cmd_upload_pack(int argc, char **argv, const char *prefix)
 217  {
 218         char *dir;
 219         int i;