Commit e568bedf526693e2a8aab5811364ae5a3a16f4e2
2013-10-30T06:08:54
add.c example: deploy helpers, reorg
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170
diff --git a/examples/add.c b/examples/add.c
index a0edf43..0411ca7 100644
--- a/examples/add.c
+++ b/examples/add.c
@@ -14,19 +14,49 @@ struct print_payload {
git_repository *repo;
};
-void init_array(git_strarray *array, int argc, char **argv)
+/* Forward declarations for helpers */
+static void parse_opts(int *options, int *count, int argc, char *argv[]);
+void init_array(git_strarray *array, int argc, char **argv);
+int print_matched_cb(const char *path, const char *matched_pathspec, void *payload);
+
+int main (int argc, char** argv)
{
- unsigned int i;
+ git_index_matched_path_cb matched_cb = NULL;
+ git_repository *repo = NULL;
+ git_index *index;
+ git_strarray array = {0};
+ int options = 0, count = 0;
+ struct print_payload payload = {0};
- array->count = argc;
- array->strings = malloc(sizeof(char*) * array->count);
- assert(array->strings!=NULL);
+ git_threads_init();
- for(i=0; i<array->count; i++) {
- array->strings[i]=argv[i];
+ parse_opts(&options, &count, argc, argv);
+
+ init_array(&array, argc-count, argv+count);
+
+ check_lg2(git_repository_open(&repo, "."), "No git repository", NULL);
+ check_lg2(git_repository_index(&index, repo), "Could not open repository index", NULL);
+
+ if (options&VERBOSE || options&SKIP) {
+ matched_cb = &print_matched_cb;
}
- return;
+ payload.options = options;
+ payload.repo = repo;
+
+ if (options&UPDATE) {
+ git_index_update_all(index, &array, matched_cb, &payload);
+ } else {
+ git_index_add_all(index, &array, 0, matched_cb, &payload);
+ }
+
+ git_index_write(index);
+ git_index_free(index);
+ git_repository_free(repo);
+
+ git_threads_shutdown();
+
+ return 0;
}
int print_matched_cb(const char *path, const char *matched_pathspec, void *payload)
@@ -55,36 +85,46 @@ int print_matched_cb(const char *path, const char *matched_pathspec, void *paylo
return ret;
}
+void init_array(git_strarray *array, int argc, char **argv)
+{
+ unsigned int i;
+
+ array->count = argc;
+ array->strings = malloc(sizeof(char*) * array->count);
+ assert(array->strings!=NULL);
+
+ for(i=0; i<array->count; i++) {
+ array->strings[i]=argv[i];
+ }
+
+ return;
+}
+
void print_usage(void)
{
fprintf(stderr, "usage: add [options] [--] file-spec [file-spec] [...]\n\n");
fprintf(stderr, "\t-n, --dry-run dry run\n");
fprintf(stderr, "\t-v, --verbose be verbose\n");
fprintf(stderr, "\t-u, --update update tracked files\n");
+ exit(1);
}
-
-int main (int argc, char** argv)
+static void parse_opts(int *options, int *count, int argc, char *argv[])
{
- git_index_matched_path_cb matched_cb = NULL;
- git_repository *repo = NULL;
- git_index *index;
- git_strarray array = {0};
- int i, options = 0;
- struct print_payload payload = {0};
+ int i;
for (i = 1; i < argc; ++i) {
if (argv[i][0] != '-') {
break;
}
else if(!strcmp(argv[i], "--verbose") || !strcmp(argv[i], "-v")) {
- options |= VERBOSE;
+ *options |= VERBOSE;
}
else if(!strcmp(argv[i], "--dry-run") || !strcmp(argv[i], "-n")) {
- options |= SKIP;
+ *options |= SKIP;
}
else if(!strcmp(argv[i], "--update") || !strcmp(argv[i], "-u")) {
- options |= UPDATE;
+ *options |= UPDATE;
}
else if(!strcmp(argv[i], "-h")) {
print_usage();
@@ -97,47 +137,11 @@ int main (int argc, char** argv)
else {
fprintf(stderr, "Unsupported option %s.\n", argv[i]);
print_usage();
- return 1;
}
}
- if (argc<=i) {
+ if (argc<=i)
print_usage();
- return 1;
- }
- git_threads_init();
-
- init_array(&array, argc-i, argv+i);
-
- if (git_repository_open(&repo, ".") < 0) {
- fprintf(stderr, "No git repository\n");
- return 1;
- }
-
- if (git_repository_index(&index, repo) < 0) {
- fprintf(stderr, "Could not open repository index\n");
- return 1;
- }
-
- if (options&VERBOSE || options&SKIP) {
- matched_cb = &print_matched_cb;
- }
-
- payload.options = options;
- payload.repo = repo;
-
- if (options&UPDATE) {
- git_index_update_all(index, &array, matched_cb, &payload);
- } else {
- git_index_add_all(index, &array, 0, matched_cb, &payload);
- }
-
- git_index_write(index);
- git_index_free(index);
- git_repository_free(repo);
-
- git_threads_shutdown();
-
- return 0;
+ *count = i;
}