>From a155ba68fad01ed30f287d384d6cd044d287e0ea Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 11 Jun 2012 14:12:12 +0200 Subject: [PATCH 2/3] string functions macros with yaffs_ prefix --- yaffs_guts.c | 38 +++++++++++++++++++------------------- yaffs_nameval.c | 6 +++--- yportenv_multi.h | 5 +++++ yportenv_single.h | 4 ++++ 4 files changed, 31 insertions(+), 22 deletions(-) diff --git a/yaffs_guts.c b/yaffs_guts.c index 0f1b471..78554a6 100644 --- a/yaffs_guts.c +++ b/yaffs_guts.c @@ -676,9 +676,9 @@ void yaffs_set_obj_name(struct yaffs_obj *obj, const YCHAR * name) { memset(obj->short_name, 0, sizeof(obj->short_name)); if (name && - strnlen(name, YAFFS_SHORT_NAME_LENGTH + 1) <= + yaffs_strnlen(name, YAFFS_SHORT_NAME_LENGTH + 1) <= YAFFS_SHORT_NAME_LENGTH) - strcpy(obj->short_name, name); + yaffs_strcpy(obj->short_name, name); else obj->short_name[0] = _Y('\0'); obj->sum = yaffs_calc_name_sum(name); @@ -2045,10 +2045,10 @@ YCHAR *yaffs_clone_str(const YCHAR *str) if (!str) str = _Y(""); - len = strnlen(str, YAFFS_MAX_ALIAS_LENGTH); + len = yaffs_strnlen(str, YAFFS_MAX_ALIAS_LENGTH); new_str = kmalloc((len + 1) * sizeof(YCHAR), GFP_NOFS); if (new_str) { - strncpy(new_str, str, len); + yaffs_strncpy(new_str, str, len); new_str[len] = 0; } return new_str; @@ -3222,14 +3222,14 @@ static void yaffs_load_name_from_oh(struct yaffs_dev *dev, YCHAR *name, n--; } } else { - strncpy(name, oh_name + 1, buff_size - 1); + yaffs_strncpy(name, oh_name + 1, buff_size - 1); } } else { #else dev = dev; { #endif - strncpy(name, oh_name, buff_size - 1); + yaffs_strncpy(name, oh_name, buff_size - 1); } } @@ -3266,14 +3266,14 @@ static void yaffs_load_oh_from_name(struct yaffs_dev *dev, YCHAR *oh_name, } else { /* Unicode name, so save starting at the second YCHAR */ *oh_name = 0; - strncpy(oh_name + 1, name, YAFFS_MAX_NAME_LENGTH - 2); + yaffs_strncpy(oh_name + 1, name, YAFFS_MAX_NAME_LENGTH - 2); } } else { #else dev = dev; { #endif - strncpy(oh_name, name, YAFFS_MAX_NAME_LENGTH - 1); + yaffs_strncpy(oh_name, name, YAFFS_MAX_NAME_LENGTH - 1); } } @@ -3298,7 +3298,7 @@ int yaffs_update_oh(struct yaffs_obj *in, const YCHAR *name, int force, struct yaffs_obj_hdr *oh = NULL; loff_t file_size = 0; - strcpy(old_name, _Y("silly old name")); + yaffs_strcpy(old_name, _Y("silly old name")); if (in->fake && in != dev->root_dir && !force && !xmod) return ret_val; @@ -3367,7 +3367,7 @@ int yaffs_update_oh(struct yaffs_obj *in, const YCHAR *name, int force, alias = in->variant.symlink_variant.alias; if (!alias) alias = _Y("no alias"); - strncpy(oh->alias, alias, YAFFS_MAX_ALIAS_LENGTH); + yaffs_strncpy(oh->alias, alias, YAFFS_MAX_ALIAS_LENGTH); oh->alias[YAFFS_MAX_ALIAS_LENGTH] = 0; break; } @@ -4093,7 +4093,7 @@ int yaffs_rename_obj(struct yaffs_obj *old_dir, const YCHAR *old_name, force = 1; #endif - if (strnlen(new_name, YAFFS_MAX_NAME_LENGTH + 1) > + if (yaffs_strnlen(new_name, YAFFS_MAX_NAME_LENGTH + 1) > YAFFS_MAX_NAME_LENGTH) /* ENAMETOOLONG */ return YAFFS_FAIL; @@ -4420,7 +4420,7 @@ static void yaffs_fix_null_name(struct yaffs_obj *obj, YCHAR *name, int buffer_size) { /* Create an object name if we could not find one. */ - if (strnlen(name, YAFFS_MAX_NAME_LENGTH) == 0) { + if (yaffs_strnlen(name, YAFFS_MAX_NAME_LENGTH) == 0) { YCHAR local_name[20]; YCHAR num_string[20]; YCHAR *x = &num_string[19]; @@ -4432,9 +4432,9 @@ static void yaffs_fix_null_name(struct yaffs_obj *obj, YCHAR *name, v /= 10; } /* make up a name */ - strcpy(local_name, YAFFS_LOSTNFOUND_PREFIX); - strcat(local_name, x); - strncpy(name, local_name, buffer_size - 1); + yaffs_strcpy(local_name, YAFFS_LOSTNFOUND_PREFIX); + yaffs_strcat(local_name, x); + yaffs_strncpy(name, local_name, buffer_size - 1); } } @@ -4443,9 +4443,9 @@ int yaffs_get_obj_name(struct yaffs_obj *obj, YCHAR *name, int buffer_size) memset(name, 0, buffer_size * sizeof(YCHAR)); yaffs_check_obj_details_loaded(obj); if (obj->obj_id == YAFFS_OBJECTID_LOSTNFOUND) { - strncpy(name, YAFFS_LOSTNFOUND_NAME, buffer_size - 1); + yaffs_strncpy(name, YAFFS_LOSTNFOUND_NAME, buffer_size - 1); } else if (obj->short_name[0]) { - strcpy(name, obj->short_name); + yaffs_strcpy(name, obj->short_name); } else if (obj->hdr_chunk > 0) { int result; u8 *buffer = yaffs_get_temp_buffer(obj->my_dev); @@ -4467,7 +4467,7 @@ int yaffs_get_obj_name(struct yaffs_obj *obj, YCHAR *name, int buffer_size) yaffs_fix_null_name(obj, name, buffer_size); - return strnlen(name, YAFFS_MAX_NAME_LENGTH); + return yaffs_strnlen(name, YAFFS_MAX_NAME_LENGTH); } loff_t yaffs_get_obj_length(struct yaffs_obj *obj) @@ -4480,7 +4480,7 @@ loff_t yaffs_get_obj_length(struct yaffs_obj *obj) if (obj->variant_type == YAFFS_OBJECT_TYPE_SYMLINK) { if (!obj->variant.symlink_variant.alias) return 0; - return strnlen(obj->variant.symlink_variant.alias, + return yaffs_strnlen(obj->variant.symlink_variant.alias, YAFFS_MAX_ALIAS_LENGTH); } else { /* Only a directory should drop through to here */ diff --git a/yaffs_nameval.c b/yaffs_nameval.c index 4bdf4ed..362f046 100644 --- a/yaffs_nameval.c +++ b/yaffs_nameval.c @@ -90,7 +90,7 @@ int nval_set(char *xb, int xb_size, const YCHAR *name, const char *buf, int bsize, int flags) { int pos; - int namelen = strnlen(name, xb_size); + int namelen = yaffs_strnlen(name, xb_size); int reclen; int size_exist = 0; int space; @@ -120,7 +120,7 @@ int nval_set(char *xb, int xb_size, const YCHAR *name, const char *buf, memcpy(xb + pos, &reclen, sizeof(int)); pos += sizeof(int); - strncpy((YCHAR *) (xb + pos), name, reclen); + yaffs_strncpy((YCHAR *) (xb + pos), name, reclen); pos += (namelen + 1); memcpy(xb + pos, buf, bsize); return 0; @@ -179,7 +179,7 @@ int nval_list(const char *xb, int xb_size, char *buf, int bsize) !filled) { pos += sizeof(int); size -= sizeof(int); - name_len = strnlen((YCHAR *) (xb + pos), size); + name_len = yaffs_strnlen((YCHAR *) (xb + pos), size); if (ncopied + name_len + 1 < bsize) { memcpy(buf, xb + pos, name_len * sizeof(YCHAR)); buf += name_len; diff --git a/yportenv_multi.h b/yportenv_multi.h index 666d909..10f0755 100644 --- a/yportenv_multi.h +++ b/yportenv_multi.h @@ -54,6 +54,11 @@ #define YUCHAR unsigned char #define _Y(x) x +#define yaffs_strcat(a, b) strcat(a, b) +#define yaffs_strcpy(a, b) strcpy(a, b) +#define yaffs_strncpy(a, b, c) strncpy(a, b, c) +#define yaffs_strnlen(s, m) strnlen(s, m) + #define YAFFS_LOSTNFOUND_NAME "lost+found" #define YAFFS_LOSTNFOUND_PREFIX "obj" diff --git a/yportenv_single.h b/yportenv_single.h index d819475..817db84 100644 --- a/yportenv_single.h +++ b/yportenv_single.h @@ -35,6 +35,10 @@ #define YCHAR char #define YUCHAR unsigned char #define _Y(x) x +#define yaffs_strcat(a, b) strcat(a, b) +#define yaffs_strcpy(a, b) strcpy(a, b) +#define yaffs_strncpy(a, b, c) strncpy(a, b, c) +#define yaffs_strnlen(s, m) strnlen(s, m) #define YAFFS_LOSTNFOUND_NAME "lost+found" #define YAFFS_LOSTNFOUND_PREFIX "obj" -- 1.7.10