mergetool: Fix typo in options passed to kdiff3
[git/mergetool.git] / entry.c
blobfc3a506ecef4ed654f26c11996df109dd135a4ed
1 #include "cache.h"
2 #include "blob.h"
4 static void create_directories(const char *path, const struct checkout *state)
6 int len = strlen(path);
7 char *buf = xmalloc(len + 1);
8 const char *slash = path;
10 while ((slash = strchr(slash+1, '/')) != NULL) {
11 struct stat st;
12 int stat_status;
14 len = slash - path;
15 memcpy(buf, path, len);
16 buf[len] = 0;
18 if (len <= state->base_dir_len)
20 * checkout-index --prefix=<dir>; <dir> is
21 * allowed to be a symlink to an existing
22 * directory.
24 stat_status = stat(buf, &st);
25 else
27 * if there currently is a symlink, we would
28 * want to replace it with a real directory.
30 stat_status = lstat(buf, &st);
32 if (!stat_status && S_ISDIR(st.st_mode))
33 continue; /* ok, it is already a directory. */
36 * We know stat_status == 0 means something exists
37 * there and this mkdir would fail, but that is an
38 * error codepath; we do not care, as we unlink and
39 * mkdir again in such a case.
41 if (mkdir(buf, 0777)) {
42 if (errno == EEXIST && state->force &&
43 !unlink(buf) && !mkdir(buf, 0777))
44 continue;
45 die("cannot create directory at %s", buf);
48 free(buf);
51 static void remove_subtree(const char *path)
53 DIR *dir = opendir(path);
54 struct dirent *de;
55 char pathbuf[PATH_MAX];
56 char *name;
58 if (!dir)
59 die("cannot opendir %s (%s)", path, strerror(errno));
60 strcpy(pathbuf, path);
61 name = pathbuf + strlen(path);
62 *name++ = '/';
63 while ((de = readdir(dir)) != NULL) {
64 struct stat st;
65 if ((de->d_name[0] == '.') &&
66 ((de->d_name[1] == 0) ||
67 ((de->d_name[1] == '.') && de->d_name[2] == 0)))
68 continue;
69 strcpy(name, de->d_name);
70 if (lstat(pathbuf, &st))
71 die("cannot lstat %s (%s)", pathbuf, strerror(errno));
72 if (S_ISDIR(st.st_mode))
73 remove_subtree(pathbuf);
74 else if (unlink(pathbuf))
75 die("cannot unlink %s (%s)", pathbuf, strerror(errno));
77 closedir(dir);
78 if (rmdir(path))
79 die("cannot rmdir %s (%s)", path, strerror(errno));
82 static int create_file(const char *path, unsigned int mode)
84 mode = (mode & 0100) ? 0777 : 0666;
85 return open(path, O_WRONLY | O_CREAT | O_EXCL, mode);
88 static void *read_blob_entry(struct cache_entry *ce, const char *path, unsigned long *size)
90 enum object_type type;
91 void *new = read_sha1_file(ce->sha1, &type, size);
93 if (new) {
94 if (type == OBJ_BLOB)
95 return new;
96 free(new);
98 return NULL;
101 static int write_entry(struct cache_entry *ce, char *path, const struct checkout *state, int to_tempfile)
103 int fd;
104 long wrote;
106 switch (ntohl(ce->ce_mode) & S_IFMT) {
107 char *buf, *new;
108 unsigned long size;
110 case S_IFREG:
111 new = read_blob_entry(ce, path, &size);
112 if (!new)
113 return error("git-checkout-index: unable to read sha1 file of %s (%s)",
114 path, sha1_to_hex(ce->sha1));
117 * Convert from git internal format to working tree format
119 buf = convert_to_working_tree(ce->name, new, &size);
120 if (buf) {
121 free(new);
122 new = buf;
125 if (to_tempfile) {
126 strcpy(path, ".merge_file_XXXXXX");
127 fd = mkstemp(path);
128 } else
129 fd = create_file(path, ntohl(ce->ce_mode));
130 if (fd < 0) {
131 free(new);
132 return error("git-checkout-index: unable to create file %s (%s)",
133 path, strerror(errno));
136 wrote = write_in_full(fd, new, size);
137 close(fd);
138 free(new);
139 if (wrote != size)
140 return error("git-checkout-index: unable to write file %s", path);
141 break;
142 case S_IFLNK:
143 new = read_blob_entry(ce, path, &size);
144 if (!new)
145 return error("git-checkout-index: unable to read sha1 file of %s (%s)",
146 path, sha1_to_hex(ce->sha1));
147 if (to_tempfile || !has_symlinks) {
148 if (to_tempfile) {
149 strcpy(path, ".merge_link_XXXXXX");
150 fd = mkstemp(path);
151 } else
152 fd = create_file(path, 0666);
153 if (fd < 0) {
154 free(new);
155 return error("git-checkout-index: unable to create "
156 "file %s (%s)", path, strerror(errno));
158 wrote = write_in_full(fd, new, size);
159 close(fd);
160 free(new);
161 if (wrote != size)
162 return error("git-checkout-index: unable to write file %s",
163 path);
164 } else {
165 wrote = symlink(new, path);
166 free(new);
167 if (wrote)
168 return error("git-checkout-index: unable to create "
169 "symlink %s (%s)", path, strerror(errno));
171 break;
172 case S_IFGITLINK:
173 if (to_tempfile)
174 return error("git-checkout-index: cannot create temporary subproject %s", path);
175 if (mkdir(path, 0777) < 0)
176 return error("git-checkout-index: cannot create subproject directory %s", path);
177 break;
178 default:
179 return error("git-checkout-index: unknown file mode for %s", path);
182 if (state->refresh_cache) {
183 struct stat st;
184 lstat(ce->name, &st);
185 fill_stat_cache_info(ce, &st);
187 return 0;
190 int checkout_entry(struct cache_entry *ce, const struct checkout *state, char *topath)
192 static char path[PATH_MAX + 1];
193 struct stat st;
194 int len = state->base_dir_len;
196 if (topath)
197 return write_entry(ce, topath, state, 1);
199 memcpy(path, state->base_dir, len);
200 strcpy(path + len, ce->name);
202 if (!lstat(path, &st)) {
203 unsigned changed = ce_match_stat(ce, &st, 1);
204 if (!changed)
205 return 0;
206 if (!state->force) {
207 if (!state->quiet)
208 fprintf(stderr, "git-checkout-index: %s already exists\n", path);
209 return -1;
213 * We unlink the old file, to get the new one with the
214 * right permissions (including umask, which is nasty
215 * to emulate by hand - much easier to let the system
216 * just do the right thing)
218 unlink(path);
219 if (S_ISDIR(st.st_mode)) {
220 /* If it is a gitlink, leave it alone! */
221 if (S_ISGITLINK(ntohl(ce->ce_mode)))
222 return 0;
223 if (!state->force)
224 return error("%s is a directory", path);
225 remove_subtree(path);
227 } else if (state->not_new)
228 return 0;
229 create_directories(path, state);
230 return write_entry(ce, path, state, 0);