* src/append.c: replace bcopy() with memcpy() or memmove().

* src/lha_macro.h: ditto.

* src/lhadd.c: ditto.

* src/lharc.c: ditto.

* src/header.c: ditto.
replace bzero() with memset().

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/lha/lha/trunk@258 6a8cc165-1e22-0410-a132-eb4e3f353aba

diff --git a/src/append.c b/src/append.c
index 9d1b51d..d404104 100644 (file)
--- a/src/append.c
+++ b/src/append.c
@@ -42,7 +42,7 @@ encode_lzhuf(infp, outfp, size, original_size_var, packed_size_var,
                copyfile(infp, outfp, size, 1);
                *packed_size_var = *original_size_var = size;
        }
-       bcopy("-lh -", hdr_method, 5);
+       memcpy(hdr_method, "-lh -", 5);
        hdr_method[3] = interface.method + '0';
 
        finish_indicator2(name, "Frozen",

diff --git a/src/header.c b/src/header.c
index a8973e6..ba11dfa 100644 (file)
--- a/src/header.c
+++ b/src/header.c
@@ -527,7 +527,7 @@ get_header(fp, hdr)
     char *system_delim = "";
     int filename_case = NONE;
 
-       bzero(hdr, sizeof(LzHeader));
+       memset(hdr, 0, sizeof(LzHeader));
 
        if (((header_size = getc(fp)) == EOF) || (header_size == 0)) {
                return FALSE;   /* finish */
@@ -559,7 +559,7 @@ get_header(fp, hdr)
        } else {
                hdr->header_size = header_size;
        }
-       bcopy(data + I_METHOD, hdr->method, METHOD_TYPE_STRAGE);
+       memcpy(hdr->method, data + I_METHOD, METHOD_TYPE_STRAGE);
        setup_get(data + I_PACKED_SIZE);
        hdr->packed_size = get_longword();
        hdr->original_size = get_longword();
@@ -827,11 +827,11 @@ init_header(name, v_stat, hdr)
         system_kanji_code = optional_system_kanji_code;
 
        if (compress_method == LZHUFF5_METHOD_NUM)  /* Changed N.Watazaki */
-               bcopy(LZHUFF5_METHOD, hdr->method, METHOD_TYPE_STRAGE);
+               memcpy(hdr->method, LZHUFF5_METHOD, METHOD_TYPE_STRAGE);
        else if (compress_method)
-               bcopy(LZHUFF1_METHOD, hdr->method, METHOD_TYPE_STRAGE);
+               memcpy(hdr->method, LZHUFF1_METHOD, METHOD_TYPE_STRAGE);
        else
-               bcopy(LZHUFF0_METHOD, hdr->method, METHOD_TYPE_STRAGE);
+               memcpy(hdr->method, LZHUFF0_METHOD, METHOD_TYPE_STRAGE);
 
        hdr->packed_size = 0;
        hdr->original_size = v_stat->st_size;
@@ -878,7 +878,7 @@ init_header(name, v_stat, hdr)
 #endif
 #endif /* INCLUDE_OWNER_NAME_IN_HEADER */
        if (is_directory(v_stat)) {
-               bcopy(LZHDIRS_METHOD, hdr->method, METHOD_TYPE_STRAGE);
+               memcpy(hdr->method, LZHDIRS_METHOD, METHOD_TYPE_STRAGE);
                hdr->attribute = GENERIC_DIRECTORY_ATTRIBUTE;
                hdr->original_size = 0;
                if (len > 0 && hdr->name[len - 1] != '/')
@@ -889,7 +889,7 @@ init_header(name, v_stat, hdr)
        if (is_symlink(v_stat)) {
                char    lkname[256];    /* FIXME: no enough space */
                int             len;    
-               bcopy(LZHDIRS_METHOD, hdr->method, METHOD_TYPE_STRAGE);
+               memcpy(hdr->method, LZHDIRS_METHOD, METHOD_TYPE_STRAGE);
                hdr->attribute = GENERIC_DIRECTORY_ATTRIBUTE;
                hdr->original_size = 0;
                len = readlink(name, lkname, sizeof(lkname));
@@ -930,8 +930,8 @@ write_header(nafp, hdr)
     if (optional_system_kanji_code)
         system_kanji_code = optional_system_kanji_code;
 
-       bzero(data, LZHEADER_STRAGE);
-       bcopy(hdr->method, data + I_METHOD, METHOD_TYPE_STRAGE);
+       memset(data, 0, LZHEADER_STRAGE);
+       memcpy(data + I_METHOD, hdr->method, METHOD_TYPE_STRAGE);
        setup_put(data + I_PACKED_SIZE);
        put_longword(hdr->packed_size);
        put_longword(hdr->original_size);
@@ -964,7 +964,7 @@ write_header(nafp, hdr)
                else
                        name_length = strlen(hdr->name);
                put_byte(name_length);
-               bcopy(p ? p : hdr->name, data + I_NAME, name_length);
+               memcpy(data + I_NAME, p ? p : hdr->name, name_length);
                setup_put(data + I_NAME + name_length);
        }
 

diff --git a/src/lha_macro.h b/src/lha_macro.h
index eed347e..96e2866 100644 (file)
--- a/src/lha_macro.h
+++ b/src/lha_macro.h
@@ -318,19 +318,15 @@ typedef short                             node;
 /* ------------------------------------------------------------------------ */
 #if STDC_HEADERS
 # include <string.h>
-# define bcmp(a,b,n)    memcmp((a),(b),(n))
-# define bzero(d,n)     memset((d),0,(n))
-# define bcopy(s,d,n)   memmove((d),(s),(n))
 #else
-# ifndef HAVE_STRCHR
+# if !HAVE_STRCHR
 #  define strchr index
 #  define strrchr rindex
 # endif
 char *strchr (), *strrchr ();
-# ifdef HAVE_MEMCPY
-#  define bcmp(a,b,n)   memcmp((a),(b),(n))
-#  define bzero(d,n)    memset((d),0,(n))
-#  define bcopy(s,d,n)  memmove((d),(s),(n))
+# if !HAVE_MEMCPY
+#  define memcpy(d, s, n) bcopy ((s), (d), (n))
+#  define memmove(d, s, n) bcopy ((s), (d), (n))
 # endif
 #endif
 

diff --git a/src/lhadd.c b/src/lhadd.c
index 6dc94d7..eb390ef 100644 (file)
--- a/src/lhadd.c
+++ b/src/lhadd.c
@@ -64,7 +64,7 @@ add_one(fp, nafp, hdr)
 #if HAVE_FTRUNCATE
                ftruncate(fileno(nafp), next_pos);
 #endif
-               bcopy(LZHUFF0_METHOD, hdr->method, METHOD_TYPE_STRAGE);
+               memcpy(hdr->method, LZHUFF0_METHOD, METHOD_TYPE_STRAGE);
        }
        hdr->original_size = v_original_size;
        hdr->packed_size = v_packed_size;

diff --git a/src/lharc.c b/src/lharc.c
index 8be3833..8964293 100644 (file)
--- a/src/lharc.c
+++ b/src/lharc.c
@@ -680,7 +680,7 @@ add_sp(sp, name, len)
                sp->size *= 2;
                sp->buffer = (char *) xrealloc(sp->buffer, sp->size * sizeof(char));
        }
-       bcopy(name, sp->buffer + sp->used, len);
+       memmove(sp->buffer + sp->used, name, len);
        sp->used += len;
        sp->n++;
 }