Commit 036e81f72613e59fdf344af57ed0a381ade356b0
2012-12-29T04:08:58
Merge pull request #1177 from arrbee/update-example-showindex Update showindex example
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
diff --git a/examples/showindex.c b/examples/showindex.c
index 4b50ffd..e92a9c8 100644
--- a/examples/showindex.c
+++ b/examples/showindex.c
@@ -1,28 +1,41 @@
#include <git2.h>
#include <stdio.h>
+#include <string.h>
int main (int argc, char** argv)
{
- git_repository *repo;
+ git_repository *repo = NULL;
git_index *index;
unsigned int i, ecount;
char *dir = ".";
+ size_t dirlen;
char out[41];
out[40] = '\0';
if (argc > 1)
dir = argv[1];
- if (argc > 2) {
+ if (!dir || argc > 2) {
fprintf(stderr, "usage: showindex [<repo-dir>]\n");
return 1;
}
- if (git_repository_open_ext(&repo, dir, 0, NULL) < 0) {
- fprintf(stderr, "could not open repository: %s\n", dir);
- return 1;
+ dirlen = strlen(dir);
+ if (dirlen > 5 && strcmp(dir + dirlen - 5, "index") == 0) {
+ if (git_index_open(&index, dir) < 0) {
+ fprintf(stderr, "could not open index: %s\n", dir);
+ return 1;
+ }
+ } else {
+ if (git_repository_open_ext(&repo, dir, 0, NULL) < 0) {
+ fprintf(stderr, "could not open repository: %s\n", dir);
+ return 1;
+ }
+ if (git_repository_index(&index, repo) < 0) {
+ fprintf(stderr, "could not open repository index\n");
+ return 1;
+ }
}
- git_repository_index(&index, repo);
git_index_read(index);
ecount = git_index_entrycount(index);
@@ -37,11 +50,10 @@ int main (int argc, char** argv)
printf("File Path: %s\n", e->path);
printf(" Stage: %d\n", git_index_entry_stage(e));
printf(" Blob SHA: %s\n", out);
- printf("File Size: %d\n", (int)e->file_size);
- printf(" Device: %d\n", (int)e->dev);
- printf(" Inode: %d\n", (int)e->ino);
- printf(" UID: %d\n", (int)e->uid);
- printf(" GID: %d\n", (int)e->gid);
+ printf("File Mode: %07o\n", e->mode);
+ printf("File Size: %d bytes\n", (int)e->file_size);
+ printf("Dev/Inode: %d/%d\n", (int)e->dev, (int)e->ino);
+ printf(" UID/GID: %d/%d\n", (int)e->uid, (int)e->gid);
printf(" ctime: %d\n", (int)e->ctime.seconds);
printf(" mtime: %d\n", (int)e->mtime.seconds);
printf("\n");