folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Solaris fiddles. 

CVS patchset: 3449
CVS date: 1999/12/01 20:00:39
This commit is contained in:
jbj 1999-12-01 20:00:39 +00:00
parent 8289346751
commit 8da3fc6db1
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/rpmio.h
View File

@ -16,9 +16,9 @@ extern "C" {
#if HAVE_LIBIO_H
#include <libio.h>
#else
typedef ssize_t cookie_read_function_t (void *cookie, void *buf, size_t nbytes);
typedef ssize_t cookie_write_function_t (void *cookie, const void *buf, size_t nbytes);
typedef int cookie_seek_function_t (void *cookie, fpos_t *pos, int whence);
typedef ssize_t cookie_read_function_t (void *cookie, char *buf, size_t nbytes);
typedef ssize_t cookie_write_function_t (void *cookie, const char *buf, size_t nbytes);
typedef int cookie_seek_function_t (void *cookie, off_t offset, int whence);
typedef int cookie_close_function_t (void *cookie);
typedef struct {
cookie_read_function_t *read;
@ -26,6 +26,9 @@ typedef struct {
cookie_seek_function_t *seek;
cookie_close_function_t *close;
} cookie_io_functions_t;
FILE * fopencookie (void *magic_cookie, const char * modes,
cookie_io_functions_t io_funcs);
#define fopencookie(_a, _b, _c) (NULL)
#endif
typedef /*@null@*/ FD_t fdio_ref_function_t ( /*@only@*/ void * cookie,

4
lib/url.c
View File

@ -66,7 +66,7 @@ DBGREFS(0, (stderr, "--> url %p -- %d %s at %s:%u\n", u, u->nrefs, msg, file, li
return u;
if (u->ctrl) {
#ifndef NOTYET
FILE * fp = fdGetFp(u->ctrl);
void * fp = fdGetFp(u->ctrl);
if (fp) {
fdPush(u->ctrl, fpio, fp, -1); /* Push fpio onto stack */
Fclose(u->ctrl);
@ -83,7 +83,7 @@ DBGREFS(0, (stderr, "--> url %p -- %d %s at %s:%u\n", u, u->nrefs, msg, file, li
}
if (u->data) {
#ifndef NOTYET
FILE * fp = fdGetFp(u->data);
void * fp = fdGetFp(u->data);
if (fp) {
fdPush(u->data, fpio, fp, -1); /* Push fpio onto stack */
Fclose(u->data);

4
system.h
View File

@ -89,6 +89,10 @@ extern time_t timezone;
char *memchr ();
#endif
#if !defined(HAVE_STPCPY)
char * stpcpy(char * dest, const char * src);
#endif
#include <errno.h>
#ifndef errno
extern int errno;