{"thread":{"id":"4653","subject":"[PATCH] Rename safe_strncpy() to strlcpy().","startedAt":"2006-06-24T14:01:25Z","lastAt":"2006-06-25T05:29:30Z","messageCount":2,"participants":["Peter Eriksen","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"22452","messageId":"20060624140124.GA1323@ebar092.ebar.dtu.dk","threadId":"4653","inReplyTo":null,"subject":"[PATCH] Rename safe_strncpy() to strlcpy().","fromName":"Peter Eriksen","fromEmail":"s022018@student.dtu.dk","sentAt":"2006-06-24T14:01:25Z","receivedAt":"2006-06-24T14:01:25Z","isPatch":true,"sender":{"key":"s022018@student.dtu.dk","avatar":null},"body":"This cleans up the use of safe_strncpy() even more.  Since it has the\nsame semantics as strlcpy() use this name instead.  Also move the\ndefinition from inside path.c to its own file compat/strlcpy.c, and use\nit conditionally at compile time, since some platforms already has\nstrlcpy().  It's included in the same way as compat/setenv.c.\n\nSigned-off-by: Peter Eriksen <s022018@student.dtu.dk>\n---\n\nI've introduced a NO_STRLCPY variable in the Makefile.  What do\nyou think about this?\n\nI've made a qualified guess as to what systems have strlcpy() in\ntheir standard library, but I am probably not completely right.\n\nThese are the ones I've said have it:\nOpenBSD, FreeBSD, NetBSD\n\nThese I've said don't:\nLinux, Darwin, SunOS, Cygwin, AIX, IRIX64\n\nRegards,\n\nPeter\n\n Makefile           |   14 ++++++++++++++\n builtin-log.c      |    2 +-\n builtin-tar-tree.c |    4 ++--\n cache.h            |    1 -\n compat/strlcpy.c   |   13 +++++++++++++\n config.c           |    6 +++---\n git-compat-util.h  |    5 +++++\n http-fetch.c       |    6 +++---\n http-push.c        |    6 +++---\n ident.c            |    4 ++--\n path.c             |   15 +--------------\n sha1_name.c        |    2 +-\n 12 files changed, 48 insertions(+), 30 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex e29e3fa..cde619c 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -26,6 +26,8 @@ # d_type in struct dirent (latest Cygwin\n #\n # Define NO_STRCASESTR if you don't have strcasestr.\n #\n+# Define NO_STRLCPY if you don't have strlcpy.\n+#\n # Define NO_SETENV if you don't have setenv in the C library.\n #\n # Define NO_SYMLINK_HEAD if you never want .git/HEAD to be a symbolic link.\n@@ -240,9 +242,13 @@ # We choose to avoid \"if .. else if .. e\n # because maintaining the nesting to match is a pain.  If\n # we had \"elif\" things would have been much nicer...\n \n+ifeq ($(uname_S),Linux)\n+\tNO_STRLCPY = YesPlease\n+endif\n ifeq ($(uname_S),Darwin)\n \tNEEDS_SSL_WITH_CRYPTO = YesPlease\n \tNEEDS_LIBICONV = YesPlease\n+\tNO_STRLCPY = YesPlease\n \t## fink\n \tifeq ($(shell test -d /sw/lib && echo y),y)\n \t\tALL_CFLAGS += -I/sw/include\n@@ -259,6 +265,7 @@ ifeq ($(uname_S),SunOS)\n \tNEEDS_NSL = YesPlease\n \tSHELL_PATH = /bin/bash\n \tNO_STRCASESTR = YesPlease\n+\tNO_STRLCPY = YesPlease\n \tifeq ($(uname_R),5.8)\n \t\tNEEDS_LIBICONV = YesPlease\n \t\tNO_UNSETENV = YesPlease\n@@ -276,6 +283,7 @@ ifeq ($(uname_O),Cygwin)\n \tNO_D_TYPE_IN_DIRENT = YesPlease\n \tNO_D_INO_IN_DIRENT = YesPlease\n \tNO_STRCASESTR = YesPlease\n+\tNO_STRLCPY = YesPlease\n \tNO_SYMLINK_HEAD = YesPlease\n \tNEEDS_LIBICONV = YesPlease\n \t# There are conflicting reports about this.\n@@ -305,12 +313,14 @@ ifeq ($(uname_S),NetBSD)\n endif\n ifeq ($(uname_S),AIX)\n \tNO_STRCASESTR=YesPlease\n+\tNO_STRLCPY = YesPlease\n \tNEEDS_LIBICONV=YesPlease\n endif\n ifeq ($(uname_S),IRIX64)\n \tNO_IPV6=YesPlease\n \tNO_SETENV=YesPlease\n \tNO_STRCASESTR=YesPlease\n+\tNO_STRLCPY = YesPlease\n \tNO_SOCKADDR_STORAGE=YesPlease\n \tSHELL_PATH=/usr/gnu/bin/bash\n \tALL_CFLAGS += -DPATH_MAX=1024\n@@ -403,6 +413,10 @@ ifdef NO_STRCASESTR\n \tCOMPAT_CFLAGS += -DNO_STRCASESTR\n \tCOMPAT_OBJS += compat/strcasestr.o\n endif\n+ifdef NO_STRLCPY\n+\tCOMPAT_CFLAGS += -DNO_STRLCPY\n+\tCOMPAT_OBJS += compat/strlcpy.o\n+endif\n ifdef NO_SETENV\n \tCOMPAT_CFLAGS += -DNO_SETENV\n \tCOMPAT_OBJS += compat/setenv.o\ndiff --git a/builtin-log.c b/builtin-log.c\nindex 5a8a50b..44d2d13 100644\n--- a/builtin-log.c\n+++ b/builtin-log.c\n@@ -115,7 +115,7 @@ static void reopen_stdout(struct commit \n \tint len = 0;\n \n \tif (output_directory) {\n-\t\tsafe_strncpy(filename, output_directory, 1010);\n+\t\tstrlcpy(filename, output_directory, 1010);\n \t\tlen = strlen(filename);\n \t\tif (filename[len - 1] != '/')\n \t\t\tfilename[len++] = '/';\ndiff --git a/builtin-tar-tree.c b/builtin-tar-tree.c\nindex 39a61b6..f2e48aa 100644\n--- a/builtin-tar-tree.c\n+++ b/builtin-tar-tree.c\n@@ -233,8 +233,8 @@ static void write_entry(const unsigned c\n \t/* XXX: should we provide more meaningful info here? */\n \tsprintf(header.uid, \"%07o\", 0);\n \tsprintf(header.gid, \"%07o\", 0);\n-\tsafe_strncpy(header.uname, \"git\", sizeof(header.uname));\n-\tsafe_strncpy(header.gname, \"git\", sizeof(header.gname));\n+\tstrlcpy(header.uname, \"git\", sizeof(header.uname));\n+\tstrlcpy(header.gname, \"git\", sizeof(header.gname));\n \tsprintf(header.devmajor, \"%07o\", 0);\n \tsprintf(header.devminor, \"%07o\", 0);\n \ndiff --git a/cache.h b/cache.h\nindex efeafea..14358a8 100644\n--- a/cache.h\n+++ b/cache.h\n@@ -216,7 +216,6 @@ enum sharedrepo {\n int git_config_perm(const char *var, const char *value);\n int adjust_shared_perm(const char *path);\n int safe_create_leading_directories(char *path);\n-size_t safe_strncpy(char *, const char *, size_t);\n char *enter_repo(char *path, int strict);\n \n /* Read and unpack a sha1 file into memory, write memory to a sha1 file */\ndiff --git a/compat/strlcpy.c b/compat/strlcpy.c\nnew file mode 100644\nindex 0000000..b66856a\n--- /dev/null\n+++ b/compat/strlcpy.c\n@@ -0,0 +1,13 @@\n+#include <string.h>\n+\n+size_t gitstrlcpy(char *dest, const char *src, size_t size)\n+{\n+\tsize_t ret = strlen(src);\n+\n+\tif (size) {\n+\t\tsize_t len = (ret >= size) ? size - 1 : ret;\n+\t\tmemcpy(dest, src, len);\n+\t\tdest[len] = '\\0';\n+\t}\n+\treturn ret;\n+}\ndiff --git a/config.c b/config.c\nindex 3e077d4..ec44827 100644\n--- a/config.c\n+++ b/config.c\n@@ -280,17 +280,17 @@ int git_default_config(const char *var, \n \t}\n \n \tif (!strcmp(var, \"user.name\")) {\n-\t\tsafe_strncpy(git_default_name, value, sizeof(git_default_name));\n+\t\tstrlcpy(git_default_name, value, sizeof(git_default_name));\n \t\treturn 0;\n \t}\n \n \tif (!strcmp(var, \"user.email\")) {\n-\t\tsafe_strncpy(git_default_email, value, sizeof(git_default_email));\n+\t\tstrlcpy(git_default_email, value, sizeof(git_default_email));\n \t\treturn 0;\n \t}\n \n \tif (!strcmp(var, \"i18n.commitencoding\")) {\n-\t\tsafe_strncpy(git_commit_encoding, value, sizeof(git_commit_encoding));\n+\t\tstrlcpy(git_commit_encoding, value, sizeof(git_commit_encoding));\n \t\treturn 0;\n \t}\n \ndiff --git a/git-compat-util.h b/git-compat-util.h\nindex b3d4cf5..93f5580 100644\n--- a/git-compat-util.h\n+++ b/git-compat-util.h\n@@ -79,6 +79,11 @@ #define strcasestr gitstrcasestr\n extern char *gitstrcasestr(const char *haystack, const char *needle);\n #endif\n \n+#ifdef NO_STRLCPY\n+#define strlcpy gitstrlcpy\n+extern size_t gitstrlcpy(char *, const char *, size_t);\n+#endif\n+\n static inline void *xmalloc(size_t size)\n {\n \tvoid *ret = malloc(size);\ndiff --git a/http-fetch.c b/http-fetch.c\nindex 2b63d89..44eba5f 100644\n--- a/http-fetch.c\n+++ b/http-fetch.c\n@@ -584,8 +584,8 @@ static void process_alternates_response(\n \t\t\t// skip 'objects' at end\n \t\t\tif (okay) {\n \t\t\t\ttarget = xmalloc(serverlen + posn - i - 6);\n-\t\t\t\tsafe_strncpy(target, base, serverlen);\n-\t\t\t\tsafe_strncpy(target + serverlen, data + i, posn - i - 6);\n+\t\t\t\tstrlcpy(target, base, serverlen);\n+\t\t\t\tstrlcpy(target + serverlen, data + i, posn - i - 6);\n \t\t\t\tif (get_verbosely)\n \t\t\t\t\tfprintf(stderr,\n \t\t\t\t\t\t\"Also look at %s\\n\", target);\n@@ -727,7 +727,7 @@ xml_cdata(void *userData, const XML_Char\n \tif (ctx->cdata)\n \t\tfree(ctx->cdata);\n \tctx->cdata = xmalloc(len + 1);\n-\tsafe_strncpy(ctx->cdata, s, len + 1);\n+\tstrlcpy(ctx->cdata, s, len + 1);\n }\n \n static int remote_ls(struct alt_base *repo, const char *path, int flags,\ndiff --git a/http-push.c b/http-push.c\nindex 8d472f0..3c89a17 100644\n--- a/http-push.c\n+++ b/http-push.c\n@@ -1271,7 +1271,7 @@ xml_cdata(void *userData, const XML_Char\n \tif (ctx->cdata)\n \t\tfree(ctx->cdata);\n \tctx->cdata = xmalloc(len + 1);\n-\tsafe_strncpy(ctx->cdata, s, len + 1);\n+\tstrlcpy(ctx->cdata, s, len + 1);\n }\n \n static struct remote_lock *lock_remote(char *path, long timeout)\n@@ -1473,7 +1473,7 @@ static void process_ls_object(struct rem\n \t\treturn;\n \tpath += 8;\n \tobj_hex = xmalloc(strlen(path));\n-\tsafe_strncpy(obj_hex, path, 3);\n+\tstrlcpy(obj_hex, path, 3);\n \tstrcpy(obj_hex + 2, path + 3);\n \tone_remote_object(obj_hex);\n \tfree(obj_hex);\n@@ -2172,7 +2172,7 @@ static void fetch_symref(char *path, cha\n \t/* If it's a symref, set the refname; otherwise try for a sha1 */\n \tif (!strncmp((char *)buffer.buffer, \"ref: \", 5)) {\n \t\t*symref = xmalloc(buffer.posn - 5);\n-\t\tsafe_strncpy(*symref, (char *)buffer.buffer + 5, buffer.posn - 5);\n+\t\tstrlcpy(*symref, (char *)buffer.buffer + 5, buffer.posn - 5);\n \t} else {\n \t\tget_sha1_hex(buffer.buffer, sha1);\n \t}\ndiff --git a/ident.c b/ident.c\nindex 7b44cbd..efec97f 100644\n--- a/ident.c\n+++ b/ident.c\n@@ -71,9 +71,9 @@ int setup_ident(void)\n \t\tlen = strlen(git_default_email);\n \t\tgit_default_email[len++] = '.';\n \t\tif (he && (domainname = strchr(he->h_name, '.')))\n-\t\t\tsafe_strncpy(git_default_email + len, domainname + 1, sizeof(git_default_email) - len);\n+\t\t\tstrlcpy(git_default_email + len, domainname + 1, sizeof(git_default_email) - len);\n \t\telse\n-\t\t\tsafe_strncpy(git_default_email + len, \"(none)\", sizeof(git_default_email) - len);\n+\t\t\tstrlcpy(git_default_email + len, \"(none)\", sizeof(git_default_email) - len);\n \t}\n \t/* And set the default date */\n \tdatestamp(git_default_date, sizeof(git_default_date));\ndiff --git a/path.c b/path.c\nindex 36972fd..db8905f 100644\n--- a/path.c\n+++ b/path.c\n@@ -77,25 +77,12 @@ int git_mkstemp(char *path, size_t len, \n \t\tpch += n;\n \t}\n \n-\tsafe_strncpy(pch, template, len);\n+\tstrlcpy(pch, template, len);\n \n \treturn mkstemp(path);\n }\n \n \n-size_t safe_strncpy(char *dest, const char *src, size_t size)\n-{\n-\tsize_t ret = strlen(src);\n-\n-\tif (size) {\n-\t\tsize_t len = (ret >= size) ? size - 1 : ret;\n-\t\tmemcpy(dest, src, len);\n-\t\tdest[len] = '\\0';\n-\t}\n-\treturn ret;\n-}\n-\n-\n int validate_symref(const char *path)\n {\n \tstruct stat st;\ndiff --git a/sha1_name.c b/sha1_name.c\nindex cd85d1f..f2cbafa 100644\n--- a/sha1_name.c\n+++ b/sha1_name.c\n@@ -262,7 +262,7 @@ static int get_sha1_basic(const char *st\n \t\tif (str[am] == '@' && str[am+1] == '{' && str[len-1] == '}') {\n \t\t\tint date_len = len - am - 3;\n \t\t\tchar *date_spec = xmalloc(date_len + 1);\n-\t\t\tsafe_strncpy(date_spec, str + am + 2, date_len + 1);\n+\t\t\tstrlcpy(date_spec, str + am + 2, date_len + 1);\n \t\t\tat_time = approxidate(date_spec);\n \t\t\tfree(date_spec);\n \t\t\tlen = am;\n-- \n1.4.1.rc1.g8637\n"},{"id":"22523","messageId":"7vd5cxzttx.fsf@assigned-by-dhcp.cox.net","threadId":"4653","inReplyTo":"20060624140124.GA1323@ebar092.ebar.dtu.dk","subject":"Re: [PATCH] Rename safe_strncpy() to strlcpy().","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-06-25T05:29:30Z","receivedAt":"2006-06-25T05:29:30Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Peter Eriksen\" <s022018@student.dtu.dk> writes:\n\n> This cleans up the use of safe_strncpy() even more.  Since it has the\n> same semantics as strlcpy() use this name instead.\n> ---\n>\n> I've introduced a NO_STRLCPY variable in the Makefile.  What do\n> you think about this?\n\nNo strong preference -- I can go with either name.  But people\nwith more BSD exposure than I am are probably used to see this\nfunction as strlcpy(), so if that is the case let's use this\npatch.\n\nThanks.\n"}]}