*/
#ifndef lint
-static const char rcsid[] = "$Id: fcgi_stdio.c,v 1.7 1999/07/27 15:00:16 roberts Exp $";
+static const char rcsid[] = "$Id: fcgi_stdio.c,v 1.12 2001/06/20 16:04:17 robs Exp $";
#endif /* not lint */
-#ifdef _WIN32
-#define DLLAPI __declspec(dllexport)
-#endif
+#include <errno.h> /* for errno */
+#include <stdarg.h> /* for va_arg */
+#include <stdlib.h> /* for malloc */
+#include <string.h> /* for strerror */
-#define NO_FCGI_DEFINES
-#include "fcgi_stdio.h"
-#undef NO_FCGI_DEFINES
+#include "fcgi_config.h"
-#ifdef _WIN32
-#include <windows.h>
-#endif
-#include <errno.h>
- /* for errno */
-#include <stdarg.h>
- /* for va_arg */
-#include <stdlib.h>
- /* for malloc */
-#include <string.h>
- /* for strerror */
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
+#define DLLAPI __declspec(dllexport)
+
+#define NO_FCGI_DEFINES
+#include "fcgi_stdio.h"
+#undef NO_FCGI_DEFINES
+
#include "fcgiapp.h"
#include "fcgios.h"
+#include "fcgimisc.h"
-#ifndef FALSE
-#define FALSE (0)
-#endif
-#ifndef TRUE
-#define TRUE (1)
+#ifndef _WIN32
+
+extern char **environ;
+
+/* These definitions should be supplied by stdio.h but for some
+ * reason they get lost on certain platforms. */
+#ifndef fileno
+extern int fileno(FILE *stream);
#endif
-FCGI_FILE _fcgi_sF[3];
+extern FILE *fdopen(int fildes, const char *type);
+extern FILE *popen(const char *command, const char *type);
+extern int pclose(FILE *stream);
+
+#else /* _WIN32 */
-#ifdef _WIN32
#define popen _popen
-#endif
-\f
+#define pclose _pclose
+
+#endif /* _WIN32 */
+
+FCGI_FILE _fcgi_sF[3];
+
+
/*
*----------------------------------------------------------------------
*
*/
static int acceptCalled = FALSE;
static int isCGI = FALSE;
-#ifndef _WIN32
-extern char **environ;
-#endif
int FCGI_Accept(void)
{
}
return 0;
}
-\f
+
/*
*----------------------------------------------------------------------
*
FCGI_stderr->fcgx_stream = NULL;
environ = NULL;
}
-\f
+
/*
*----------------------------------------------------------------------
*
*
*----------------------------------------------------------------------
*/
-
int FCGI_StartFilterData(void)
{
if(FCGI_stdin->stdio_stream) {
return FCGX_StartFilterData(FCGI_stdin->fcgx_stream);
}
}
-\f
+
/*
*----------------------------------------------------------------------
*
*
*----------------------------------------------------------------------
*/
-
void FCGI_SetExitStatus(int status)
{
if(FCGI_stdin->fcgx_stream) {
FCGX_SetExitStatus(status, FCGI_stdin->fcgx_stream);
}
}
-\f
+
/*
*----------------------------------------------------------------------
*
*
*----------------------------------------------------------------------
*/
-
void FCGI_perror(const char *str)
{
FCGI_fputs(str, FCGI_stderr);
FCGI_fputs(strerror(OS_Errno), FCGI_stderr);
return;
}
-\f
+
/*
*----------------------------------------------------------------------
*
*
*----------------------------------------------------------------------
*/
-
static FCGI_FILE *FCGI_OpenFromFILE(FILE *stream)
{
FCGI_FILE *fp;
- if(stream == NULL)
- return NULL;
- fp = (FCGI_FILE *)malloc(sizeof(FCGI_FILE));
- if(fp == NULL)
+
+ if (stream == NULL)
return NULL;
- fp->stdio_stream = stream;
- fp->fcgx_stream = NULL;
+
+ fp = (FCGI_FILE *) malloc(sizeof(FCGI_FILE));
+ if (fp != NULL)
+ {
+ fp->stdio_stream = stream;
+ fp->fcgx_stream = NULL;
+ }
+
return fp;
}
-\f
+
/*
*----------------------------------------------------------------------
*
*
*----------------------------------------------------------------------
*/
-
FCGI_FILE *FCGI_fopen(const char *path, const char *mode)
{
- return FCGI_OpenFromFILE(fopen(path, mode));
+ FILE * file = fopen(path, mode);
+ FCGI_FILE * fcgi_file = FCGI_OpenFromFILE(file);
+
+ if (file && !fcgi_file)
+ fclose(file);
+
+ return fcgi_file;
}
int FCGI_fclose(FCGI_FILE *fp)
}
return NULL;
}
-\f
+
/*
*----------------------------------------------------------------------
*
if(fp->stdio_stream)
setbuf(fp->stdio_stream, buf);
}
-\f
+
/*
*----------------------------------------------------------------------
*
*
*----------------------------------------------------------------------
*/
-
int FCGI_fseek(FCGI_FILE *fp, long offset, int whence)
{
if(fp->stdio_stream)
}
}
#endif
-\f
+
/*
*----------------------------------------------------------------------
*
*
*----------------------------------------------------------------------
*/
-
int FCGI_fgetc(FCGI_FILE *fp)
{
if(fp->stdio_stream)
return FCGX_UnGetChar(c, fp->fcgx_stream);
return EOF;
}
-\f
+
/*
*----------------------------------------------------------------------
*
*
*----------------------------------------------------------------------
*/
-
char *FCGI_fgets(char *str, int size, FCGI_FILE *fp)
{
if(fp->stdio_stream)
}
/*
- * There is no standard equivalent of gets that takes an explicit
- * FILE * argument, so the following "wrapper" implements
- * gets for both FILE * and FCGX_Stream * in terms of FCGI_getchar.
+ * The gets() function reads characters from the standard input stream
+ * into the array pointed to by str until a newline character is read
+ * or an end-of-file condition is encountered. The newline character
+ * is discarded and the string is terminated with a null character.
*/
-
char *FCGI_gets(char *str)
{
char *s;
int c;
+
for (s = str; ((c = FCGI_getchar()) != '\n');) {
if(c == EOF) {
if(s == str)
else
break;
} else
- *s++ = c;
+ *s++ = (char) c;
}
*s = 0;
return str;
}
-\f
+
/*
*----------------------------------------------------------------------
*
- * --
- *
* Wrappers for functions defined in H&S Section 15.8
*
* XXX: missing: fscanf, scanf
*----------------------------------------------------------------------
*/
-\f
/*
*----------------------------------------------------------------------
*
*
*----------------------------------------------------------------------
*/
-
int FCGI_fputc(int c, FCGI_FILE *fp)
{
if(fp->stdio_stream)
{
return FCGI_fputc(c, FCGI_stdout);
}
-\f
+
/*
*----------------------------------------------------------------------
*
*
*----------------------------------------------------------------------
*/
-
int FCGI_fputs(const char *str, FCGI_FILE *fp)
{
if(fp->stdio_stream)
}
return EOF;
}
-\f
+
/*
*----------------------------------------------------------------------
*
*
*----------------------------------------------------------------------
*/
-
int FCGI_fprintf(FCGI_FILE *fp, const char *format, ...)
{
va_list ap;
va_end(ap);
return n;
}
-\f
+
/*
*----------------------------------------------------------------------
*
*
*----------------------------------------------------------------------
*/
-
int FCGI_vfprintf(FCGI_FILE *fp, const char *format, va_list ap)
{
if(fp->stdio_stream)
return FCGX_VFPrintF(FCGI_stdout->fcgx_stream, format, ap);
return EOF;
}
-\f
+
/*
*----------------------------------------------------------------------
*
*
*----------------------------------------------------------------------
*/
-
size_t FCGI_fread(void *ptr, size_t size, size_t nmemb, FCGI_FILE *fp)
{
int n;
}
return (size_t)EOF;
}
-\f
+
/*
*----------------------------------------------------------------------
*
}
return;
}
-\f
+
/*
*----------------------------------------------------------------------
*
*/
FCGI_FILE *FCGI_tmpfile(void)
{
- return FCGI_OpenFromFILE(tmpfile());
+ FILE * file = tmpfile();
+ FCGI_FILE * fcgi_file = FCGI_OpenFromFILE(file);
+
+ if (file && !fcgi_file)
+ fclose(file);
+
+ return fcgi_file;
}
-\f
/*
*----------------------------------------------------------------------
*
*
*----------------------------------------------------------------------
*/
-
-/*
- * These definitions should be supplied by stdio.h but for some
- * reason they get lost on certain platforms.
- */
-/*
- * XXX: Need to find the right way to handle this for NT
- */
-#ifndef _WIN32
-#ifndef fileno
-extern int fileno(FILE *stream);
-#endif
-extern FILE *fdopen(int fildes, const char *type);
-extern FILE *popen(const char *command, const char *type);
-extern int pclose(FILE *stream);
-#endif
-
int FCGI_fileno(FCGI_FILE *fp)
{
if(fp->stdio_stream)
FCGI_FILE *FCGI_fdopen(int fd, const char *mode)
{
-#ifndef _WIN32
- return FCGI_OpenFromFILE(fdopen(fd, mode));
-#else
- return NULL;
-#endif
+ FILE * file = fdopen(fd, mode);
+ FCGI_FILE * fcgi_file = FCGI_OpenFromFILE(file);
+
+ if (file && !fcgi_file)
+ fclose(file);
+
+ return fcgi_file;
}
FCGI_FILE *FCGI_popen(const char *cmd, const char *type)
{
- return FCGI_OpenFromFILE(popen(cmd, type));
+ FILE * file = popen(cmd, type);
+ FCGI_FILE * fcgi_file = FCGI_OpenFromFILE(file);
+
+ if (file && !fcgi_file)
+ pclose(file);
+
+ return fcgi_file;
}
int FCGI_pclose(FCGI_FILE *fp)
{
int n = EOF;
- if(fp->stdio_stream) {
-#ifndef _WIN32
+ if (fp->stdio_stream) {
n = pclose(fp->stdio_stream);
-#endif
fp->stdio_stream = NULL;
} else if(fp->fcgx_stream) {
/*
}
return n;
}
-
-/*
- *----------------------------------------------------------------------
- */
projects / catagits/fcgi2.git / blobdiff