Fix sparse warnings
Fix warnings from 'make check'.
- These files don't include 'builtin.h' causing sparse to complain that
cmd_* isn't declared:
builtin/clone.c:364, builtin/fetch-pack.c:797,
builtin/fmt-merge-msg.c:34, builtin/hash-object.c:78,
builtin/merge-index.c:69, builtin/merge-recursive.c:22
builtin/merge-tree.c:341, builtin/mktag.c:156, builtin/notes.c:426
builtin/notes.c:822, builtin/pack-redundant.c:596,
builtin/pack-refs.c:10, builtin/patch-id.c:60, builtin/patch-id.c:149,
builtin/remote.c:1512, builtin/remote-ext.c:240,
builtin/remote-fd.c:53, builtin/reset.c:236, builtin/send-pack.c:384,
builtin/unpack-file.c:25, builtin/var.c:75
- These files have symbols which should be marked static since they're
only file scope:
submodule.c:12, diff.c:631, replace_object.c:92, submodule.c:13,
submodule.c:14, trace.c:78, transport.c:195, transport-helper.c:79,
unpack-trees.c:19, url.c:3, url.c:18, url.c:104, url.c:117, url.c:123,
url.c:129, url.c:136, thread-utils.c:21, thread-utils.c:48
- These files redeclare symbols to be different types:
builtin/index-pack.c:210, parse-options.c:564, parse-options.c:571,
usage.c:49, usage.c:58, usage.c:63, usage.c:72
- These files use a literal integer 0 when they really should use a NULL
pointer:
daemon.c:663, fast-import.c:2942, imap-send.c:1072, notes-merge.c:362
While we're in the area, clean up some unused #includes in builtin files
(mostly exec_cmd.h).
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-03-22 08:51:05 +01:00
|
|
|
#include "builtin.h"
|
2010-10-12 18:39:43 +02:00
|
|
|
#include "transport.h"
|
|
|
|
#include "run-command.h"
|
|
|
|
|
|
|
|
/*
|
|
|
|
* URL syntax:
|
|
|
|
* 'command [arg1 [arg2 [...]]]' Invoke command with given arguments.
|
|
|
|
* Special characters:
|
|
|
|
* '% ': Literal space in argument.
|
|
|
|
* '%%': Literal percent sign.
|
|
|
|
* '%S': Name of service (git-upload-pack/git-upload-archive/
|
|
|
|
* git-receive-pack.
|
|
|
|
* '%s': Same as \s, but with possible git- prefix stripped.
|
|
|
|
* '%G': Only allowed as first 'character' of argument. Do not pass this
|
|
|
|
* Argument to command, instead send this as name of repository
|
|
|
|
* in in-line git://-style request (also activates sending this
|
|
|
|
* style of request).
|
|
|
|
* '%V': Only allowed as first 'character' of argument. Used in
|
|
|
|
* conjunction with '%G': Do not pass this argument to command,
|
|
|
|
* instead send this as vhost in git://-style request (note: does
|
|
|
|
* not activate sending git:// style request).
|
|
|
|
*/
|
|
|
|
|
|
|
|
static char *git_req;
|
|
|
|
static char *git_req_vhost;
|
|
|
|
|
|
|
|
static char *strip_escapes(const char *str, const char *service,
|
|
|
|
const char **next)
|
|
|
|
{
|
|
|
|
size_t rpos = 0;
|
|
|
|
int escape = 0;
|
|
|
|
char special = 0;
|
2014-10-04 20:54:50 +02:00
|
|
|
const char *service_noprefix = service;
|
2010-10-12 18:39:43 +02:00
|
|
|
struct strbuf ret = STRBUF_INIT;
|
|
|
|
|
2014-10-04 20:54:50 +02:00
|
|
|
skip_prefix(service_noprefix, "git-", &service_noprefix);
|
2010-10-12 18:39:43 +02:00
|
|
|
|
|
|
|
/* Pass the service to command. */
|
|
|
|
setenv("GIT_EXT_SERVICE", service, 1);
|
2014-10-04 20:54:50 +02:00
|
|
|
setenv("GIT_EXT_SERVICE_NOPREFIX", service_noprefix, 1);
|
2010-10-12 18:39:43 +02:00
|
|
|
|
|
|
|
/* Scan the length of argument. */
|
|
|
|
while (str[rpos] && (escape || str[rpos] != ' ')) {
|
|
|
|
if (escape) {
|
|
|
|
switch (str[rpos]) {
|
|
|
|
case ' ':
|
|
|
|
case '%':
|
|
|
|
case 's':
|
|
|
|
case 'S':
|
|
|
|
break;
|
|
|
|
case 'G':
|
|
|
|
case 'V':
|
|
|
|
special = str[rpos];
|
|
|
|
if (rpos == 1)
|
|
|
|
break;
|
|
|
|
/* Fall-through to error. */
|
|
|
|
default:
|
|
|
|
die("Bad remote-ext placeholder '%%%c'.",
|
|
|
|
str[rpos]);
|
|
|
|
}
|
|
|
|
escape = 0;
|
|
|
|
} else
|
|
|
|
escape = (str[rpos] == '%');
|
|
|
|
rpos++;
|
|
|
|
}
|
|
|
|
if (escape && !str[rpos])
|
|
|
|
die("remote-ext command has incomplete placeholder");
|
|
|
|
*next = str + rpos;
|
|
|
|
if (**next == ' ')
|
|
|
|
++*next; /* Skip over space */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Do the actual placeholder substitution. The string will be short
|
|
|
|
* enough not to overflow integers.
|
|
|
|
*/
|
|
|
|
rpos = special ? 2 : 0; /* Skip first 2 bytes in specials. */
|
|
|
|
escape = 0;
|
|
|
|
while (str[rpos] && (escape || str[rpos] != ' ')) {
|
|
|
|
if (escape) {
|
|
|
|
switch (str[rpos]) {
|
|
|
|
case ' ':
|
|
|
|
case '%':
|
|
|
|
strbuf_addch(&ret, str[rpos]);
|
|
|
|
break;
|
|
|
|
case 's':
|
2014-10-04 20:54:50 +02:00
|
|
|
strbuf_addstr(&ret, service_noprefix);
|
2010-10-12 18:39:43 +02:00
|
|
|
break;
|
|
|
|
case 'S':
|
|
|
|
strbuf_addstr(&ret, service);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
escape = 0;
|
|
|
|
} else
|
|
|
|
switch (str[rpos]) {
|
|
|
|
case '%':
|
|
|
|
escape = 1;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
strbuf_addch(&ret, str[rpos]);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
rpos++;
|
|
|
|
}
|
|
|
|
switch (special) {
|
|
|
|
case 'G':
|
|
|
|
git_req = strbuf_detach(&ret, NULL);
|
|
|
|
return NULL;
|
|
|
|
case 'V':
|
|
|
|
git_req_vhost = strbuf_detach(&ret, NULL);
|
|
|
|
return NULL;
|
|
|
|
default:
|
|
|
|
return strbuf_detach(&ret, NULL);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Should be enough... */
|
|
|
|
#define MAXARGUMENTS 256
|
|
|
|
|
|
|
|
static const char **parse_argv(const char *arg, const char *service)
|
|
|
|
{
|
|
|
|
int arguments = 0;
|
|
|
|
int i;
|
|
|
|
const char **ret;
|
|
|
|
char *temparray[MAXARGUMENTS + 1];
|
|
|
|
|
|
|
|
while (*arg) {
|
|
|
|
char *expanded;
|
|
|
|
if (arguments == MAXARGUMENTS)
|
|
|
|
die("remote-ext command has too many arguments");
|
|
|
|
expanded = strip_escapes(arg, service, &arg);
|
|
|
|
if (expanded)
|
|
|
|
temparray[arguments++] = expanded;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = xmalloc((arguments + 1) * sizeof(char *));
|
|
|
|
for (i = 0; i < arguments; i++)
|
|
|
|
ret[i] = temparray[i];
|
|
|
|
ret[arguments] = NULL;
|
2010-11-17 18:15:34 +01:00
|
|
|
return ret;
|
2010-10-12 18:39:43 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void send_git_request(int stdin_fd, const char *serv, const char *repo,
|
|
|
|
const char *vhost)
|
|
|
|
{
|
|
|
|
size_t bufferspace;
|
|
|
|
size_t wpos = 0;
|
|
|
|
char *buffer;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Request needs 12 bytes extra if there is vhost (xxxx \0host=\0) and
|
|
|
|
* 6 bytes extra (xxxx \0) if there is no vhost.
|
|
|
|
*/
|
|
|
|
if (vhost)
|
|
|
|
bufferspace = strlen(serv) + strlen(repo) + strlen(vhost) + 12;
|
|
|
|
else
|
|
|
|
bufferspace = strlen(serv) + strlen(repo) + 6;
|
|
|
|
|
|
|
|
if (bufferspace > 0xFFFF)
|
|
|
|
die("Request too large to send");
|
|
|
|
buffer = xmalloc(bufferspace);
|
|
|
|
|
|
|
|
/* Make the packet. */
|
|
|
|
wpos = sprintf(buffer, "%04x%s %s%c", (unsigned)bufferspace,
|
|
|
|
serv, repo, 0);
|
|
|
|
|
|
|
|
/* Add vhost if any. */
|
|
|
|
if (vhost)
|
|
|
|
sprintf(buffer + wpos, "host=%s%c", vhost, 0);
|
|
|
|
|
|
|
|
/* Send the request */
|
|
|
|
if (write_in_full(stdin_fd, buffer, bufferspace) < 0)
|
|
|
|
die_errno("Failed to send request");
|
|
|
|
|
|
|
|
free(buffer);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int run_child(const char *arg, const char *service)
|
|
|
|
{
|
|
|
|
int r;
|
2014-08-19 21:09:35 +02:00
|
|
|
struct child_process child = CHILD_PROCESS_INIT;
|
2010-10-12 18:39:43 +02:00
|
|
|
|
|
|
|
child.in = -1;
|
|
|
|
child.out = -1;
|
|
|
|
child.err = 0;
|
|
|
|
child.argv = parse_argv(arg, service);
|
|
|
|
|
|
|
|
if (start_command(&child) < 0)
|
|
|
|
die("Can't run specified command");
|
|
|
|
|
|
|
|
if (git_req)
|
|
|
|
send_git_request(child.in, service, git_req, git_req_vhost);
|
|
|
|
|
|
|
|
r = bidirectional_transfer_loop(child.out, child.in);
|
|
|
|
if (!r)
|
|
|
|
r = finish_command(&child);
|
|
|
|
else
|
|
|
|
finish_command(&child);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define MAXCOMMAND 4096
|
|
|
|
|
|
|
|
static int command_loop(const char *child)
|
|
|
|
{
|
|
|
|
char buffer[MAXCOMMAND];
|
|
|
|
|
|
|
|
while (1) {
|
2011-01-16 04:49:40 +01:00
|
|
|
size_t i;
|
2010-10-12 18:39:43 +02:00
|
|
|
if (!fgets(buffer, MAXCOMMAND - 1, stdin)) {
|
|
|
|
if (ferror(stdin))
|
|
|
|
die("Comammand input error");
|
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
/* Strip end of line characters. */
|
2011-01-16 04:49:40 +01:00
|
|
|
i = strlen(buffer);
|
|
|
|
while (i > 0 && isspace(buffer[i - 1]))
|
|
|
|
buffer[--i] = 0;
|
2010-10-12 18:39:43 +02:00
|
|
|
|
|
|
|
if (!strcmp(buffer, "capabilities")) {
|
|
|
|
printf("*connect\n\n");
|
|
|
|
fflush(stdout);
|
|
|
|
} else if (!strncmp(buffer, "connect ", 8)) {
|
|
|
|
printf("\n");
|
|
|
|
fflush(stdout);
|
|
|
|
return run_child(child, buffer + 8);
|
|
|
|
} else {
|
|
|
|
fprintf(stderr, "Bad command");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
int cmd_remote_ext(int argc, const char **argv, const char *prefix)
|
|
|
|
{
|
2010-11-17 18:15:34 +01:00
|
|
|
if (argc != 3)
|
|
|
|
die("Expected two arguments");
|
2010-10-12 18:39:43 +02:00
|
|
|
|
|
|
|
return command_loop(argv[2]);
|
|
|
|
}
|