diff options
author | Hiroki Sato <hrs@FreeBSD.org> | 2010-01-02 14:47:20 +0000 |
---|---|---|
committer | Hiroki Sato <hrs@FreeBSD.org> | 2010-01-02 14:47:20 +0000 |
commit | 4b38031b7f2a6cc8fcf3ef57a907f00dcc2b5335 (patch) | |
tree | fb4d9f6e7af5bc43687100e12721b75ba27087b9 /japanese/FreeWnn-lib/files/patch-Wnn-etc-bcopy.c | |
parent | - Update to 0.5.7 (diff) |
- Improve buffer management. This change should fix issues on amd64.
- Fix daemonizing part. It now returns the exit status correctly.
- Fix *_{pre,post}cmd handling in the rc.d scripts. Plus,
wnntouch is now invoked just before running the server process.
- Use ${*_WNNMANDIR} in Makefile to use the common patchset
in both FreeWnn-server and -lib.
- Integrate libtool22 change and regenerate patch files.
Notes
Notes:
svn path=/head/; revision=246996
Diffstat (limited to 'japanese/FreeWnn-lib/files/patch-Wnn-etc-bcopy.c')
-rw-r--r-- | japanese/FreeWnn-lib/files/patch-Wnn-etc-bcopy.c | 81 |
1 files changed, 81 insertions, 0 deletions
diff --git a/japanese/FreeWnn-lib/files/patch-Wnn-etc-bcopy.c b/japanese/FreeWnn-lib/files/patch-Wnn-etc-bcopy.c new file mode 100644 index 000000000000..ae2390e172dd --- /dev/null +++ b/japanese/FreeWnn-lib/files/patch-Wnn-etc-bcopy.c @@ -0,0 +1,81 @@ +Index: Wnn/etc/bcopy.c +=================================================================== +RCS file: /home/cvs/private/hrs/freewnn/Wnn/etc/bcopy.c,v +retrieving revision 1.1.1.1 +retrieving revision 1.2 +diff -u -p -r1.1.1.1 -r1.2 +--- Wnn/etc/bcopy.c 20 Dec 2008 07:13:30 -0000 1.1.1.1 ++++ Wnn/etc/bcopy.c 20 Dec 2008 15:22:40 -0000 1.2 +@@ -38,47 +38,43 @@ + + #ifndef HAVE_BCOPY + void +-bcopy (b1, b2, length) +- unsigned char *b1, *b2; +- int length; ++bcopy(unsigned char *b1, ++ unsigned char *b2, ++ int length) + { +- if (length <= 0) +- return; +- if (b1 < b2 && b1 + length > b2) +- { +- b2 += length; +- b1 += length; +- while (length--) +- { +- *--b2 = *--b1; +- } +- } +- else +- { +- memcpy (b2, b1, length); +- } ++ if (length <= 0) ++ return; ++ ++ if (b1 < b2 && b1 + length > b2) { ++ b2 += length; ++ b1 += length; ++ ++ while (length--) ++ *--b2 = *--b1; ++ } else { ++ memcpy (b2, b1, length); ++ } + } + #endif /* !HAVE_BCOPY */ + + #ifndef HAVE_BZERO + void +-bzero (b, length) +- unsigned char *b; +- int length; ++bzero(unsigned char *b, ++ int length) + { +- memset (b, 0, length); ++ memset (b, 0, length); + } + #endif /* !HAVE_BZERO */ + + #ifndef HAVE_BCMP + int +-bcmp (b1, b2, length) +- unsigned char *b1; +- unsigned char *b2; +- int length; ++bcmp(unsigned char *b1, ++ unsigned *b2, ++ int length) + { +- if (length == 0) +- return 0; +- return memcmp (b1, b2, length); ++ if (length == 0) ++ return 0; ++ ++ return memcmp(b1, b2, length); + } + #endif /* !HAVE_BCMP */ |