cvs: php4 /main Makefile.in main.c php_logos.c php_logos.h

zeev Thu Nov 2 06:18:34 2000 EDT Added files: /php4/main php_logos.c php_logos.h Modified files: /php4/main Makefile.in main.c Log: Fix a few warnings Index: php4/main/Makefile.in diff -u php4/main/Makefile.in:1.11 php4/main/Makefile.in:1.12 --- php4/main/Makefile.in:1.11 Mon Oct 30 15:39:14 2000 +++ php4/main/Makefile.in Thu Nov 2 06:18:34 2000 @@ -5,7 +5,7 @@ safe_mode.c fopen-wrappers.c alloca.c \ php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \ strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \ - network.c php_open_temporary_file.c + network.c php_open_temporary_file.c php_logos.c include $(top_srcdir)/build/ltlib.mk Index: php4/main/main.c diff -u php4/main/main.c:1.335 php4/main/main.c:1.336 --- php4/main/main.c:1.335 Tue Oct 31 09:21:52 2000 +++ php4/main/main.c Thu Nov 2 06:18:34 2000 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.335 2000/10/31 17:21:52 hholzgra Exp $ */ +/* $Id: main.c,v 1.336 2000/11/02 14:18:34 zeev Exp $ */ #include <stdio.h> @@ -71,6 +71,7 @@ #include "php_content_types.h" #include "php_ticks.h" +#include "php_logos.h" #include "SAPI.h" @@ -883,8 +884,8 @@ zend_set_utility_values(&zuv); php_startup_sapi_content_types(); - REGISTER_MAIN_STRINGL_CONSTANT("PHP_VERSION", PHP_VERSION, sizeof(PHP_VERSION)-1, CONST_PERSISTENT | CONST_CS); - REGISTER_MAIN_STRINGL_CONSTANT("PHP_OS", php_os, strlen(php_os), CONST_PERSISTENT | CONST_CS); + REGISTER_MAIN_STRINGL_CONSTANT("PHP_VERSION", PHP_VERSION, sizeof(PHP_VERSION)-1, CONST_PERSISTENT | CONST_CS); + REGISTER_MAIN_STRINGL_CONSTANT("PHP_OS", php_os, strlen(php_os), CONST_PERSISTENT | CONST_CS); if (php_startup_ticks(PLS_C) == FAILURE) { php_printf("Unable to start PHP ticks\n"); @@ -1135,75 +1136,6 @@ zend_hash_update(track_vars_array->value.ht, "argc", sizeof("argc"), &argc, sizeof(pval *), NULL); } - -#include "logos.h" - -typedef struct _php_info_logo { - char *mimetype; - int mimelen; - unsigned char *data; - int size; -} php_info_logo; - -HashTable phpinfo_logo_hash; - -PHPAPI int php_register_info_logo(char *logo_string, char *mimetype, unsigned char *data, int size) -{ - php_info_logo *info_logo = (php_info_logo *)malloc(sizeof(php_info_logo)); - - if(!info_logo) return FAILURE; - info_logo->mimetype = mimetype; - info_logo->mimelen = strlen(mimetype); - info_logo->data = data; - info_logo->size = size; - - return zend_hash_add(&phpinfo_logo_hash, logo_string, strlen(logo_string), info_logo, sizeof(php_info_logo), NULL); -} - -PHPAPI int php_unregister_info_logos(char *logo_string) -{ - return zend_hash_del(&phpinfo_logo_hash, logo_string, strlen(logo_string)); -} - -int php_init_info_logos(void) -{ - if(zend_hash_init(&phpinfo_logo_hash, 0, NULL, NULL, 1)==FAILURE) - return FAILURE; - - php_register_info_logo(PHP_LOGO_GUID , "image/gif", php_logo , sizeof(php_logo)); - php_register_info_logo(PHP_EGG_LOGO_GUID, "image/gif", php_egg_logo, sizeof(php_egg_logo)); - php_register_info_logo(ZEND_LOGO_GUID , "image/gif", zend_logo , sizeof(zend_logo)); - - return SUCCESS; -} - -int php_shutdown_info_logos(void) -{ - zend_hash_destroy(&phpinfo_logo_hash); - return SUCCESS; -} - -#define CONTENT_TYPE_HEADER "Content-Type: " -static int php_info_logos(char *logo_string) -{ - php_info_logo *logo_image; - char *content_header; - int len; - - if(FAILURE==zend_hash_find(&phpinfo_logo_hash,logo_string,strlen(logo_string),(void **)&logo_image)) - return 0; - - len=strlen(CONTENT_TYPE_HEADER)+logo_image->mimelen; - content_header=malloc(len+1); - if(!content_header) return 0; - strcpy(content_header,CONTENT_TYPE_HEADER); - strcat(content_header,logo_image->mimetype); - sapi_add_header(content_header, len, 1); - free(content_header); - - PHPWRITE(logo_image->data, logo_image->size); - return 1; -} PHPAPI int php_handle_special_queries(SLS_D PLS_DC) { Index: php4/main/php_logos.c +++ php4/main/php_logos.c /* +----------------------------------------------------------------------+ | PHP version 4.0 | +----------------------------------------------------------------------+ | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 2.02 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | | available at through the world-wide-web at | | http://www.php.net/license/2_02.txt. | | If you did not receive a copy of the PHP license and are unable to | | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ | Authors: Hartmut Holzgraefe <hartmut@six.de> | +----------------------------------------------------------------------+ */ #include "php.h" #include "logos.h" #include "php_logos.h" #include "ext/standard/info.h" #include "SAPI.h" typedef struct _php_info_logo { char *mimetype; int mimelen; unsigned char *data; int size; } php_info_logo; HashTable phpinfo_logo_hash; PHPAPI int php_register_info_logo(char *logo_string, char *mimetype, unsigned char *data, int size) { php_info_logo *info_logo = (php_info_logo *)malloc(sizeof(php_info_logo)); if(!info_logo) return FAILURE; info_logo->mimetype = mimetype; info_logo->mimelen = strlen(mimetype); info_logo->data = data; info_logo->size = size; return zend_hash_add(&phpinfo_logo_hash, logo_string, strlen(logo_string), info_logo, sizeof(php_info_logo), NULL); } PHPAPI int php_unregister_info_logos(char *logo_string) { return zend_hash_del(&phpinfo_logo_hash, logo_string, strlen(logo_string)); } int php_init_info_logos(void) { if(zend_hash_init(&phpinfo_logo_hash, 0, NULL, NULL, 1)==FAILURE) return FAILURE; php_register_info_logo(PHP_LOGO_GUID , "image/gif", php_logo , sizeof(php_logo)); php_register_info_logo(PHP_EGG_LOGO_GUID, "image/gif", php_egg_logo, sizeof(php_egg_logo)); php_register_info_logo(ZEND_LOGO_GUID , "image/gif", zend_logo , sizeof(zend_logo)); return SUCCESS; } int php_shutdown_info_logos(void) { zend_hash_destroy(&phpinfo_logo_hash); return SUCCESS; } #define CONTENT_TYPE_HEADER "Content-Type: " int php_info_logos(char *logo_string) { php_info_logo *logo_image; char *content_header; int len; if(FAILURE==zend_hash_find(&phpinfo_logo_hash,logo_string,strlen(logo_string),(void **)&logo_image)) return 0; len=strlen(CONTENT_TYPE_HEADER)+logo_image->mimelen; content_header=malloc(len+1); if(!content_header) return 0; strcpy(content_header,CONTENT_TYPE_HEADER); strcat(content_header,logo_image->mimetype); sapi_add_header(content_header, len, 1); free(content_header); PHPWRITE(logo_image->data, logo_image->size); return 1; } Index: php4/main/php_logos.h +++ php4/main/php_logos.h #ifndef _PHP_LOGOS_H #define _PHP_LOGOS_H PHPAPI int php_register_info_logo(char *logo_string, char *mimetype, unsigned char *data, int size); PHPAPI int php_unregister_info_logos(char *logo_string); int php_init_info_logos(void); int php_shutdown_info_logos(void); int php_info_logos(char *logo_string); #endif /* _PHP_LOGOS_H */