On Tue, Sep 29, 2015 at 04:50:39PM -0700, Michael Blume wrote:
> I see compile errors on my mac:
>
> First a whole bunch of
>
> ./compat/precompose_utf8.h:30:45: warning: declaration of 'struct
> strbuf' will not be visible outside of this function [-Wvisibility]
> void probe_utf8_pathname_composition(struct strbuf *path);
Wow, my patch isn't even close to reasonable. I didn't realize because
we do not compile this code at all for non-Mac platforms. Sorry.
It probably needs something like this squashed in (completely untested):
diff --git a/builtin/init-db.c b/builtin/init-db.c
index cf6a3c8..c643054 100644
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -283,7 +283,7 @@ static int create_default_files(const char *template_path)
path = git_path_buf(&buf, "CoNfIg");
if (!access(path, F_OK))
git_config_set("core.ignorecase", "true");
- probe_utf8_pathname_composition(path);
+ probe_utf8_pathname_composition(&buf);
}
strbuf_release(&buf);
diff --git a/compat/precompose_utf8.c b/compat/precompose_utf8.c
index b4dd3c7..d2d2405 100644
--- a/compat/precompose_utf8.c
+++ b/compat/precompose_utf8.c
@@ -8,6 +8,7 @@
#include "cache.h"
#include "utf8.h"
#include "precompose_utf8.h"
+#include "strbuf.h"
typedef char *iconv_ibp;
static const char *repo_encoding = "UTF-8";
@@ -45,17 +46,17 @@ void probe_utf8_pathname_composition(struct strbuf *path)
if (precomposed_unicode != -1)
return; /* We found it defined in the global config, respect it
*/
strbuf_addstr(path, auml_nfc);
- output_fd = open(path, O_CREAT|O_EXCL|O_RDWR, 0600);
+ output_fd = open(path->buf, O_CREAT|O_EXCL|O_RDWR, 0600);
if (output_fd >= 0) {
close(output_fd);
strbuf_setlen(path, baselen);
strbuf_addstr(path, auml_nfd);
- precomposed_unicode = access(path, R_OK) ? 0 : 1;
+ precomposed_unicode = access(path->buf, R_OK) ? 0 : 1;
git_config_set("core.precomposeunicode", precomposed_unicode ?
"true" : "false");
strbuf_setlen(path, baselen);
strbuf_addstr(path, auml_nfc);
- if (unlink(path))
- die_errno(_("failed to unlink '%s'"), path);
+ if (unlink(path->buf))
+ die_errno(_("failed to unlink '%s'"), path->buf);
}
strbuf_setlen(path, baselen);
}
diff --git a/compat/precompose_utf8.h b/compat/precompose_utf8.h
index 7fc7be5..229e772 100644
--- a/compat/precompose_utf8.h
+++ b/compat/precompose_utf8.h
@@ -4,6 +4,7 @@
#include <dirent.h>
#include <iconv.h>
+struct strbuf;
typedef struct dirent_prec_psx {
ino_t d_ino; /* Posix */
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
