cvs: php4 /ext/imap php_imap.c
| From: | Andi Gutmans | Date: | Wed, 02 May 2001 22:57:02 +0000 |
| Subject: | cvs: php4 /ext/imap php_imap.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-5479@lists.php.net to get a copy of this message | ||
andi Wed May 2 15:57:02 2001 EDT
Modified files:
/php4/ext/imap php_imap.c
Log:
- More strncpy() -> strlcpy() changes. mm_login() doesn't seem to be used
though.
Index: php4/ext/imap/php_imap.c
diff -u php4/ext/imap/php_imap.c:1.69 php4/ext/imap/php_imap.c:1.70
--- php4/ext/imap/php_imap.c:1.69 Wed May 2 10:46:44 2001
+++ php4/ext/imap/php_imap.c Wed May 2 15:57:01 2001
@@ -25,7 +25,7 @@
| PHP 4.0 updates: Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_imap.c,v 1.69 2001/05/02 17:46:44 chagenbu Exp $ */
+/* $Id: php_imap.c,v 1.70 2001/05/02 22:57:01 andi Exp $ */
#define IMAP41
@@ -4305,19 +4305,19 @@
#if HAVE_IMSP
if (*mb->service && strcmp(mb->service, "imsp") == 0) {
if (*mb->user) {
- strncpy(user, mb->user, MAILTMPLEN);
+ strlcpy(user, mb->user, MAILTMPLEN);
} else {
- strncpy(user, imsp_user, MAILTMPLEN);
+ strlcpy(user, imsp_user, MAILTMPLEN);
}
- strncpy (pwd, imsp_password, MAILTMPLEN);
+ strlcpy (pwd, imsp_password, MAILTMPLEN);
} else {
#endif
if (*mb->user) {
- strncpy (user,mb->user, MAILTMPLEN);
+ strlcpy (user,mb->user, MAILTMPLEN);
} else {
- strncpy (user, IMAPG(imap_user), MAILTMPLEN);
+ strlcpy (user, IMAPG(imap_user), MAILTMPLEN);
}
- strncpy (pwd, IMAPG(imap_password), MAILTMPLEN);
+ strlcpy (pwd, IMAPG(imap_password), MAILTMPLEN);
#if HAVE_IMSP
}
#endif