#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <dirent.h>
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <limits.h>
#include <stdarg.h>
-#include <glob.h>
+#include <sys/ioctl.h>
+#include "git-compat-util.h"
+#include "exec_cmd.h"
#ifndef PATH_MAX
# define PATH_MAX 4096
static const char git_usage[] =
"Usage: git [--version] [--exec-path[=GIT_EXEC_PATH]] [--help] COMMAND [ ARGS ]";
-struct string_list {
- size_t len;
- char *str;
- struct string_list *next;
-};
-
/* most gui terms set COLUMNS (although some don't export it) */
static int term_columns(void)
{
if (col_string && (n_cols = atoi(col_string)) > 0)
return n_cols;
+#ifdef TIOCGWINSZ
+ {
+ struct winsize ws;
+ if (!ioctl(1, TIOCGWINSZ, &ws)) {
+ if (ws.ws_col)
+ return ws.ws_col;
+ }
+ }
+#endif
+
return 80;
}
+static void oom(void)
+{
+ fprintf(stderr, "git: out of memory\n");
+ exit(1);
+}
+
static inline void mput_char(char c, unsigned int num)
{
while(num--)
putchar(c);
}
-static void pretty_print_string_list(struct string_list *list, int longest)
+static struct cmdname {
+ size_t len;
+ char name[1];
+} **cmdname;
+static int cmdname_alloc, cmdname_cnt;
+
+static void add_cmdname(const char *name, int len)
+{
+ struct cmdname *ent;
+ if (cmdname_alloc <= cmdname_cnt) {
+ cmdname_alloc = cmdname_alloc + 200;
+ cmdname = realloc(cmdname, cmdname_alloc * sizeof(*cmdname));
+ if (!cmdname)
+ oom();
+ }
+ ent = malloc(sizeof(*ent) + len);
+ if (!ent)
+ oom();
+ ent->len = len;
+ memcpy(ent->name, name, len);
+ ent->name[len] = 0;
+ cmdname[cmdname_cnt++] = ent;
+}
+
+static int cmdname_compare(const void *a_, const void *b_)
+{
+ struct cmdname *a = *(struct cmdname **)a_;
+ struct cmdname *b = *(struct cmdname **)b_;
+ return strcmp(a->name, b->name);
+}
+
+static void pretty_print_string_list(struct cmdname **cmdname, int longest)
{
- int cols = 1;
+ int cols = 1, rows;
int space = longest + 1; /* min 1 SP between words */
int max_cols = term_columns() - 1; /* don't print *on* the edge */
+ int i, j;
if (space < max_cols)
cols = max_cols / space;
+ rows = (cmdname_cnt + cols - 1) / cols;
- while (list) {
- int c;
- printf(" ");
+ qsort(cmdname, cmdname_cnt, sizeof(*cmdname), cmdname_compare);
- for (c = cols; c && list; list = list->next) {
- printf("%s", list->str);
+ for (i = 0; i < rows; i++) {
+ printf(" ");
- if (--c)
- mput_char(' ', space - list->len);
+ for (j = 0; j < cols; j++) {
+ int n = j * rows + i;
+ int size = space;
+ if (n >= cmdname_cnt)
+ break;
+ if (j == cols-1 || n + rows >= cmdname_cnt)
+ size = 1;
+ printf("%-*s", size, cmdname[n]->name);
}
putchar('\n');
}
static void list_commands(const char *exec_path, const char *pattern)
{
- struct string_list *list = NULL, *tail = NULL;
- unsigned int longest = 0, i;
- glob_t gl;
-
- if (chdir(exec_path) < 0) {
- printf("git: '%s': %s\n", exec_path, strerror(errno));
+ unsigned int longest = 0;
+ char path[PATH_MAX];
+ int dirlen;
+ DIR *dir = opendir(exec_path);
+ struct dirent *de;
+
+ if (!dir) {
+ fprintf(stderr, "git: '%s': %s\n", exec_path, strerror(errno));
exit(1);
}
- i = glob(pattern, 0, NULL, &gl);
- switch(i) {
- case GLOB_NOSPACE:
- puts("Out of memory when running glob()");
- exit(2);
- case GLOB_ABORTED:
- printf("'%s': Read error: %s\n", exec_path, strerror(errno));
- exit(2);
- case GLOB_NOMATCH:
- printf("No git commands available in '%s'.\n", exec_path);
- printf("Do you need to specify --exec-path or set GIT_EXEC_PATH?\n");
+ dirlen = strlen(exec_path);
+ if (PATH_MAX - 20 < dirlen) {
+ fprintf(stderr, "git: insanely long exec-path '%s'\n",
+ exec_path);
exit(1);
}
- for (i = 0; i < gl.gl_pathc; i++) {
- int len = strlen(gl.gl_pathv[i] + 4);
+ memcpy(path, exec_path, dirlen);
+ path[dirlen++] = '/';
- if (access(gl.gl_pathv[i], X_OK))
+ while ((de = readdir(dir)) != NULL) {
+ struct stat st;
+ int entlen;
+
+ if (strncmp(de->d_name, "git-", 4))
+ continue;
+ strcpy(path+dirlen, de->d_name);
+ if (stat(path, &st) || /* stat, not lstat */
+ !S_ISREG(st.st_mode) ||
+ !(st.st_mode & S_IXUSR))
continue;
- if (longest < len)
- longest = len;
+ entlen = strlen(de->d_name);
+ if (4 < entlen && !strcmp(de->d_name + entlen - 4, ".exe"))
+ entlen -= 4;
- if (!tail)
- tail = list = malloc(sizeof(struct string_list));
- else {
- tail->next = malloc(sizeof(struct string_list));
- tail = tail->next;
- }
- tail->len = len;
- tail->str = gl.gl_pathv[i] + 4;
- tail->next = NULL;
+ if (longest < entlen)
+ longest = entlen;
+
+ add_cmdname(de->d_name + 4, entlen-4);
}
+ closedir(dir);
printf("git commands available in '%s'\n", exec_path);
printf("----------------------------");
mput_char('-', strlen(exec_path));
putchar('\n');
- pretty_print_string_list(list, longest);
+ pretty_print_string_list(cmdname, longest - 4);
putchar('\n');
}
#ifdef __GNUC__
-static void usage(const char *exec_path, const char *fmt, ...)
+static void cmd_usage(const char *exec_path, const char *fmt, ...)
__attribute__((__format__(__printf__, 2, 3), __noreturn__));
#endif
-static void usage(const char *exec_path, const char *fmt, ...)
+static void cmd_usage(const char *exec_path, const char *fmt, ...)
{
if (fmt) {
va_list ap;
int path_len = len;
if (!old_path)
- old_path = "/bin:/usr/bin:.";
+ old_path = "/usr/local/bin:/usr/bin:/bin";
path_len = len + strlen(old_path) + 1;
path = malloc(path_len + 1);
- path[path_len + 1] = '\0';
memcpy(path, dir, len);
path[len] = ':';
setenv("PATH", path, 1);
}
-/* has anyone seen 'man' installed anywhere else than in /usr/bin? */
-#define PATH_TO_MAN "/usr/bin/man"
static void show_man_page(char *git_cmd)
{
char *page;
page[page_len] = 0;
}
- execlp(PATH_TO_MAN, "man", page, NULL);
+ execlp("man", "man", page, NULL);
}
int main(int argc, char **argv, char **envp)
{
char git_command[PATH_MAX + 1];
char wd[PATH_MAX + 1];
- int i, len, show_help = 0;
- char *exec_path = getenv("GIT_EXEC_PATH");
+ int i, show_help = 0;
+ const char *exec_path;
getcwd(wd, PATH_MAX);
- if (!exec_path)
- exec_path = GIT_EXEC_PATH;
-
for (i = 1; i < argc; i++) {
char *arg = argv[i];
+ if (!strcmp(arg, "help")) {
+ show_help = 1;
+ continue;
+ }
+
if (strncmp(arg, "--", 2))
break;
if (!strncmp(arg, "exec-path", 9)) {
arg += 9;
- if (*arg == '=')
+ if (*arg == '=') {
exec_path = arg + 1;
- else {
- puts(exec_path);
+ git_set_exec_path(exec_path);
+ } else {
+ puts(git_exec_path());
exit(0);
}
}
else if (!strcmp(arg, "help"))
show_help = 1;
else if (!show_help)
- usage(NULL, NULL);
+ cmd_usage(NULL, NULL);
}
if (i >= argc || show_help) {
if (i >= argc)
- usage(exec_path, NULL);
+ cmd_usage(git_exec_path(), NULL);
show_man_page(argv[i]);
}
- /* allow relative paths, but run with exact */
- if (chdir(exec_path)) {
- printf("git: '%s': %s\n", exec_path, strerror(errno));
- exit (1);
- }
-
- getcwd(git_command, sizeof(git_command));
- chdir(wd);
-
- len = strlen(git_command);
- prepend_to_path(git_command, len);
+ exec_path = git_exec_path();
+ prepend_to_path(exec_path, strlen(exec_path));
- strncat(&git_command[len], "/git-", sizeof(git_command) - len);
- len += 5;
- strncat(&git_command[len], argv[i], sizeof(git_command) - len);
+ execv_git_cmd(argv + i);
- if (access(git_command, X_OK))
- usage(exec_path, "'%s' is not a git-command", argv[i]);
+ if (errno == ENOENT)
+ cmd_usage(exec_path, "'%s' is not a git-command", argv[i]);
- /* execve() can only ever return if it fails */
- execve(git_command, &argv[i], envp);
- printf("Failed to run command '%s': %s\n", git_command, strerror(errno));
+ fprintf(stderr, "Failed to run command '%s': %s\n",
+ git_command, strerror(errno));
return 1;
}
projects / git.git / blobdiff