[PHP-DEV] CVS update: php3/functions From: rasmus (php-dev <email protected>)
Date: 03/30/99

Date: Tuesday March 30, 1999 @ 6:25
Author: rasmus

Update of /repository/php3/functions
In directory asf:/home/rasmus/php3/functions

Modified Files:
        crypt.c imap.c php3_string.h
Log Message:
Add crypt_salt_length() function

Index: php3/functions/crypt.c
diff -c php3/functions/crypt.c:1.41 php3/functions/crypt.c:1.42
*** php3/functions/crypt.c:1.41 Sun Jan 3 17:46:42 1999
--- php3/functions/crypt.c Tue Mar 30 06:25:03 1999
***************
*** 28,34 ****
     | Rasmus Lerdorf <rasmus <email protected>> |
     +----------------------------------------------------------------------+
   */
! /* $Id: crypt.c,v 1.41 1999/01/03 22:46:42 rasmus Exp $ */
  #include <stdlib.h>
  
  #include "php.h"
--- 28,34 ----
     | Rasmus Lerdorf <rasmus <email protected>> |
     +----------------------------------------------------------------------+
   */
! /* $Id: crypt.c,v 1.42 1999/03/30 11:25:03 rasmus Exp $ */
  #include <stdlib.h>
  
  #include "php.h"
***************
*** 62,67 ****
--- 62,68 ----
  
  function_entry crypt_functions[] = {
          {"crypt", php3_crypt, NULL},
+ {"crypt_salt_length", php3_crypt_salt_length, NULL},
          {NULL, NULL, NULL}
  };
  
***************
*** 169,178 ****
--- 170,191 ----
          return_value->type = IS_STRING;
          pval_copy_constructor(return_value);
  }
+ /* }}} */
  
+ /* {{{ proto crypt_salt_length(void)
+ Return the length of the salt used in the crypt function on this system */
+ void php3_crypt_salt_length(INTERNAL_FUNCTION_PARAMETERS) {
+ #ifdef PHP3_STD_DES_CRYPT
+ RETVAL_LONG(2);
+ #else
+ #if PHP3_MD5_CRYPT
+ RETVAL_LONG(12);
  #endif
+ #endif
+ }
  /* }}} */
  
+ #endif
  
  /*
   * Local variables:
Index: php3/functions/imap.c
diff -c php3/functions/imap.c:1.55 php3/functions/imap.c:1.56
*** php3/functions/imap.c:1.55 Wed Jan 20 11:10:56 1999
--- php3/functions/imap.c Tue Mar 30 06:25:04 1999
***************
*** 31,37 ****
     | Rasmus Lerdorf <rasmus <email protected>> |
     +----------------------------------------------------------------------+
   */
! /* $Id: imap.c,v 1.55 1999/01/20 16:10:56 musone Exp $ */
  
  #define IMAP41
  
--- 31,37 ----
     | Rasmus Lerdorf <rasmus <email protected>> |
     +----------------------------------------------------------------------+
   */
! /* $Id: imap.c,v 1.56 1999/03/30 11:25:04 rasmus Exp $ */
  
  #define IMAP41
  
***************
*** 1814,1820 ****
          }
  
          convert_to_string( text );
! object_init(return_value);
  
          decode = (char *) rfc822_qprint((unsigned char *) text->value.str.val, text->value.str.len,&newlength);
          RETVAL_STRINGL(decode,newlength,1);
--- 1814,1820 ----
          }
  
          convert_to_string( text );
! /* object_init(return_value); Why is this here? -RL */
  
          decode = (char *) rfc822_qprint((unsigned char *) text->value.str.val, text->value.str.len,&newlength);
          RETVAL_STRINGL(decode,newlength,1);
Index: php3/functions/php3_string.h
diff -c php3/functions/php3_string.h:1.36 php3/functions/php3_string.h:1.37
*** php3/functions/php3_string.h:1.36 Fri Mar 26 05:54:00 1999
--- php3/functions/php3_string.h Tue Mar 30 06:25:04 1999
***************
*** 29,35 ****
   */
  
  
! /* $Id: php3_string.h,v 1.36 1999/03/26 10:54:00 sas Exp $ */
  
  #ifndef _PHPSTRING_H
  #define _PHPSTRING_H
--- 29,35 ----
   */
  
  
! /* $Id: php3_string.h,v 1.37 1999/03/30 11:25:04 rasmus Exp $ */
  
  #ifndef _PHPSTRING_H
  #define _PHPSTRING_H
***************
*** 84,89 ****
--- 84,90 ----
  extern php3_module_entry crypt_module_entry;
  #define crypt_module_ptr &crypt_module_entry
  extern void php3_crypt(INTERNAL_FUNCTION_PARAMETERS);
+ extern void php3_crypt_salt_length(INTERNAL_FUNCTION_PARAMETERS);
  #else
  #define crypt_module_ptr NULL
  #endif 

--
PHP Development Mailing List   http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe <email protected>
For help: php-dev-help <email protected>