-diff -ur rpm-4.4.1/configure.ac rpm-4.4.1-no-neon/configure.ac
---- rpm-4.4.1/configure.ac 2005-06-19 20:37:35.675035608 +0200
-+++ rpm-4.4.1-no-neon/configure.ac 2005-06-19 20:34:07.022755576 +0200
-@@ -448,26 +448,6 @@
+--- rpm-4.4.2/configure.ac.orig 2005-07-23 14:06:59.692430464 +0200
++++ rpm-4.4.2/configure.ac 2005-07-23 14:08:45.591331384 +0200
+@@ -516,28 +516,6 @@
WITH_NEON_SUBDIR=
WITH_NEON_INCLUDE=
WITH_NEON_LIB=
-AC_CHECK_HEADER([neon/ne_session.h], [
-- AC_CHECK_LIB(neon, ne_session_create, [
-- AC_DEFINE(HAVE_LIBNEON, 1, [Define to 1 if you have the `neon' library (-lneon).])
-- AC_CHECK_LIB(neon, ne_get_response_header, [
-- AC_DEFINE(HAVE_NEON_NE_GET_RESPONSE_HEADER, 1, [Define to 1 if you have ne_get_response_header() in libneon.])
-- ])
-- AC_CHECK_LIB(neon, ne_send_request_chunk, [
-- AC_DEFINE(HAVE_NEON_NE_SEND_REQUEST_CHUNK, 1, [Define to 1 if you have ne_send_request_chunk() in libneon.])
-- ])
-- WITH_NEON_INCLUDE="-I${includedir}/neon"
-- WITH_NEON_LIB="-lneon"
-- ])
-- ], [
-- if test -d neon ; then
-- AC_DEFINE(HAVE_LIBNEON, 1, [Define to 1 if you have the `neon' library (-lneon).])
-- WITH_NEON_SUBDIR=neon
-- WITH_NEON_INCLUDE="-I\${top_srcdir}/${WITH_NEON_SUBDIR}/src"
-- WITH_NEON_LIB="\${top_builddir}/${WITH_NEON_SUBDIR}/src/libneon.la"
-- fi
+- AC_CHECK_LIB(neon, ne_session_create, [
+- AC_DEFINE(HAVE_LIBNEON, 1, [Define to 1 if you have the 'neon' library (-lneon).])
+- AC_CHECK_LIB(neon, ne_get_response_header, [
+- AC_DEFINE(HAVE_NEON_NE_GET_RESPONSE_HEADER, 1, [Define to 1 if you have ne_get_response_header() in libneon.])
+- ])
+- AC_CHECK_LIB(neon, ne_send_request_chunk, [
+- AC_DEFINE(HAVE_NEON_NE_SEND_REQUEST_CHUNK, 1, [Define to 1 if you have ne_send_request_chunk() in libneon.])
+- ])
+- WITH_NEON_INCLUDE="-I${includedir}/neon"
+- WITH_NEON_LIB="-lneon"
+- ])
+-],[
+- if test -d neon ; then
+- AC_DEFINE(HAVE_LIBNEON, 1, [Define to 1 if you have the 'neon' library (-lneon).])
+-# XXX HAVE_NEON_NE_GET_RESPONSE_HEADER assumes libneon-0.25 devel internal
+- AC_DEFINE(HAVE_NEON_NE_GET_RESPONSE_HEADER, 1, [Define to 1 if you have ne_get_response_header() in libneon.])
+- WITH_NEON_SUBDIR=neon
+- WITH_NEON_INCLUDE="-I\${top_srcdir}/${WITH_NEON_SUBDIR}/src"
+- WITH_NEON_LIB="\${top_builddir}/${WITH_NEON_SUBDIR}/src/libneon.la"
+- fi
-])
AC_SUBST(WITH_NEON_SUBDIR)
AC_SUBST(WITH_NEON_INCLUDE)
AC_SUBST(WITH_NEON_LIB)
-diff -ur rpm-4.4.1/rpmio/Makefile.am rpm-4.4.1-no-neon/rpmio/Makefile.am
---- rpm-4.4.1/rpmio/Makefile.am 2005-06-19 20:37:35.322089264 +0200
-+++ rpm-4.4.1-no-neon/rpmio/Makefile.am 2005-06-19 20:34:06.996759528 +0200
-@@ -37,7 +37,7 @@
- @WITH_LUA_LIB@ \
- $(top_builddir)/file/src/libmagic.la \
- @WITH_ZLIB_LIB@ \
-- -lneon -lpthread -lhome_etc
-+ -lpthread -lhome_etc
- librpmio_la_LIBADD = # $(BEECRYPTLOBJS)
- librpmio_la_DEPENDENCIES = # .created
-
-diff -ur rpm-4.4.1/rpmio/rpmdav.c rpm-4.4.1-no-neon/rpmio/rpmdav.c
---- rpm-4.4.1/rpmio/rpmdav.c 2005-01-17 19:46:27.000000000 +0100
-+++ rpm-4.4.1-no-neon/rpmio/rpmdav.c 2005-06-19 20:35:12.340825720 +0200
-@@ -9,17 +9,6 @@
+--- rpm-4.4.6/rpmio/rpmdav.c.orig 2006-03-12 20:24:23.000000000 +0100
++++ rpm-4.4.6/rpmio/rpmdav.c 2006-04-17 18:20:07.597482250 +0200
+@@ -9,31 +9,6 @@
#include <pthread.h>
#endif
--#include <neon/ne_alloc.h>
--#include <neon/ne_auth.h>
--#include <neon/ne_basic.h>
--#include <neon/ne_dates.h>
--#include <neon/ne_locks.h>
--#include <neon/ne_props.h>
--#include <neon/ne_request.h>
--#include <neon/ne_socket.h>
--#include <neon/ne_string.h>
--#include <neon/ne_utils.h>
+-#include "ne_alloc.h"
+-#include "ne_auth.h"
+-#include "ne_basic.h"
+-#include "ne_dates.h"
+-#include "ne_locks.h"
+-
+-#define NEONBLOWSCHUNKS
+-#ifndef NEONBLOWSCHUNKS
+-/* HACK: include ne_private.h to access sess->socket for now. */
+-#include "../neon/src/ne_private.h"
+-#endif
+-
+-#include "ne_props.h"
+-#include "ne_request.h"
+-#include "ne_socket.h"
+-#include "ne_string.h"
+-#include "ne_utils.h"
+-
+-/* XXX API changes for neon-0.26.0 */
+-#if !defined(NE_FREE)
+-#define ne_set_persist(_sess, _flag)
+-#define ne_propfind_set_private(_pfh, _create_item, NULL) \
+- ne_propfind_set_private(_pfh, _create_item, NULL, NULL)
+-#endif
-
#include <rpmio_internal.h>
#define _RPMDAV_INTERNAL
-@@ -55,1304 +44,6 @@
+@@ -69,1332 +44,6 @@
}
/* =============================================================== */
- /* XXX check that neon is ssl enabled. */
- if (!strcasecmp(u->scheme, "https"))
- ne_ssl_set_verify(u->sess, davVerifyCert, (char *)u->host);
--
+-
- ne_set_session_private(u->sess, "urlinfo", u);
-
- ne_hook_destroy_session(u->sess, davDestroySession, u);
- resr_reference,
- resr_error
-};
--
+-
-struct fetch_resource_s {
+-/*@dependent@*/
- struct fetch_resource_s *next;
- char *uri;
-/*@unused@*/
-static void *fetch_destroy_item(/*@only@*/ struct fetch_resource_s *res)
- /*@modifies res @*/
-{
-- NE_FREE(res->uri);
-- NE_FREE(res->error_reason);
+- ne_free(res->uri);
+- ne_free(res->error_reason);
- res = _free(res);
- return NULL;
-}
-
-/* =============================================================== */
-struct fetch_context_s {
--/*@relnull@*/
+-/*@relnull@*/ /*@dependent@*/
- struct fetch_resource_s **resrock;
- const char *uri;
- unsigned int include_target; /* Include resource at href */
- { "DAV:", "collection", ELM_collection }
-};
-
--static int fetch_startelm(void *userdata, int parent,
+-static int fetch_startelm(void *userdata, int parent,
- const char *nspace, const char *name,
- /*@unused@*/ const char **atts)
- /*@*/
- int state = ne_xml_mapid(fetch_idmap, NE_XML_MAPLEN(fetch_idmap),
- nspace, name);
-
-- if (r == NULL ||
+- if (r == NULL ||
- !((parent == NE_207_STATE_PROP && state == ELM_resourcetype) ||
- (parent == ELM_resourcetype && state == ELM_collection)))
- return NE_XML_DECLINE;
- return state;
-}
-
--static int fetch_compare(const struct fetch_resource_s *r1,
+-static int fetch_compare(const struct fetch_resource_s *r1,
- const struct fetch_resource_s *r2)
- /*@*/
-{
- }
-}
-
--static void fetch_results(void *userdata, const char *uri,
+-static void fetch_results(void *userdata, void *uarg,
- const ne_prop_result_set *set)
- /*@*/
-{
- const ne_status *status = NULL;
- const char * path = NULL;
-
+-#if !defined(NE_FREE)
+- const ne_uri * uri = uarg;
+- (void) urlPath(uri->path, &path);
+-#else
+- const char * uri = uarg;
- (void) urlPath(uri, &path);
+-#endif
- if (path == NULL)
- return;
-
-
-if (_dav_debug < 0)
-fprintf(stderr, "==> %s in uri %s\n", path, ctx->uri);
--
+-
- if (ne_path_compare(ctx->uri, path) == 0 && !ctx->include_target) {
- /* This is the target URI */
-if (_dav_debug < 0)
-fprintf(stderr, "==> %s skipping target resource.\n", path);
- /* Free the private structure. */
+-/*@-dependenttrans -exposetrans@*/
- free(newres);
+-/*@=dependenttrans =exposetrans@*/
- return;
- }
-
- newres->uri = ne_strdup(path);
-
-/*@-boundsread@*/
-- clength = ne_propset_value(set, &fetch_props[0]);
+- clength = ne_propset_value(set, &fetch_props[0]);
- modtime = ne_propset_value(set, &fetch_props[1]);
- isexec = ne_propset_value(set, &fetch_props[2]);
- checkin = ne_propset_value(set, &fetch_props[4]);
- checkout = ne_propset_value(set, &fetch_props[5]);
-/*@=boundsread@*/
--
+-
-/*@-branchstate@*/
- if (clength == NULL)
- status = ne_propset_status(set, &fetch_props[0]);
- newres->is_vcr = 0;
- }
-
-- for (current = *ctx->resrock, previous = NULL; current != NULL;
+- for (current = *ctx->resrock, previous = NULL; current != NULL;
- previous = current, current = current->next)
- {
- if (fetch_compare(current, newres) >= 0) {
- if (previous) {
- previous->next = newres;
- } else {
--/*@-boundswrite@*/
+-/*@-boundswrite -dependenttrans @*/
- *ctx->resrock = newres;
--/*@=boundswrite@*/
+-/*@=boundswrite =dependenttrans @*/
- }
- newres->next = current;
-}
- ctx->resrock = resrock;
- ctx->include_target = include_target;
-
-- ne_xml_push_handler(ne_propfind_get_parser(pfh),
+- ne_xml_push_handler(ne_propfind_get_parser(pfh),
- fetch_startelm, NULL, NULL, pfh);
-
- ne_propfind_set_private(pfh, fetch_create_item, NULL);
- xx = argvAdd(&ctx->av, val);
-if (_dav_debug < 0)
-fprintf(stderr, "*** argvAdd(%p,\"%s\")\n", &ctx->av, val);
-- NE_FREE(val);
+- ne_free(val);
-
- while (ctx->ac >= ctx->nalloced) {
- if (ctx->nalloced <= 0)
-}
-#endif
-
+-/*@-mustmod@*/
-static void davAcceptRanges(void * userdata, /*@null@*/ const char * value)
- /*@modifies userdata @*/
-{
- urlinfo u = userdata;
-
-- if (!(u && value)) return;
+- if (!(u != NULL && value != NULL)) return;
-if (_dav_debug < 0)
-fprintf(stderr, "*** u %p Accept-Ranges: %s\n", u, value);
- if (!strcmp(value, "bytes"))
- if (!strcmp(value, "none"))
- u->httpHasRange = 0;
-}
+-/*@=mustmod@*/
-
-#if !defined(HAVE_NEON_NE_GET_RESPONSE_HEADER)
-static void davAllHeaders(void * userdata, const char * value)
-{
- FD_t ctrl = userdata;
-
-- if (!(ctrl && value)) return;
+- if (!(ctrl != NULL && value != NULL)) return;
-if (_dav_debug)
-fprintf(stderr, "<- %s\n", value);
-}
-#endif
-
+-/*@-mustmod@*/
-static void davContentLength(void * userdata, /*@null@*/ const char * value)
- /*@modifies userdata @*/
-{
- FD_t ctrl = userdata;
-
-- if (!(ctrl && value)) return;
+- if (!(ctrl != NULL && value != NULL)) return;
-if (_dav_debug < 0)
-fprintf(stderr, "*** fd %p Content-Length: %s\n", ctrl, value);
-/*@-unrecog@*/
- ctrl->contentLength = strtoll(value, NULL, 10);
-/*@=unrecog@*/
-}
+-/*@=mustmod@*/
-
+-/*@-mustmod@*/
-static void davConnection(void * userdata, /*@null@*/ const char * value)
- /*@modifies userdata @*/
-{
- FD_t ctrl = userdata;
-
-- if (!(ctrl && value)) return;
+- if (!(ctrl != NULL && value != NULL)) return;
-if (_dav_debug < 0)
-fprintf(stderr, "*** fd %p Connection: %s\n", ctrl, value);
- if (!strcasecmp(value, "close"))
- else if (!strcasecmp(value, "Keep-Alive"))
- ctrl->persist = 1;
-}
+-/*@=mustmod@*/
-
-/*@-mustmod@*/ /* HACK: stash error in *str. */
-int davResp(urlinfo u, FD_t ctrl, /*@unused@*/ char *const * str)
-#endif
-
- if (!strcmp(httpCmd, "PUT")) {
--#ifdef NOTYET /* XXX HACK no wr_chunked until libneon supports */
+-#if defined(HAVE_NEON_NE_SEND_REQUEST_CHUNK)
- ctrl->wr_chunked = 1;
- ne_add_request_header(ctrl->req, "Transfer-Encoding", "chunked");
- ne_set_request_chunked(ctrl->req, 1);
- fd = fdNew("grab ctrl (davOpen)");
-
- if (fd) {
+- fdSetOpen(fd, url, flags, mode);
- fdSetIo(fd, ufdio);
+-
- fd->ftpFileDoneNeeded = 0;
- fd->rd_timeoutsecs = httpTimeoutSecs;
- fd->contentLength = fd->bytesRemain = -1;
- rc = ne_read_response_block(fd->req, buf, count);
-
-if (_dav_debug < 0) {
--fprintf(stderr, "*** davRead(%p,%p,0x%x) rc 0x%x\n", cookie, buf, count, (unsigned)rc);
+-fprintf(stderr, "*** davRead(%p,%p,0x%x) rc 0x%x\n", cookie, buf, (unsigned)count, (unsigned)rc);
-#ifdef DYING
-hexdump(buf, rc);
-#endif
-
-ssize_t davWrite(void * cookie, const char * buf, size_t count)
-{
--#ifdef NOTYET /* XXX HACK no wr_chunked until libneon supports */
- FD_t fd = cookie;
- ssize_t rc;
- int xx;
-
+-#if !defined(NEONBLOWSCHUNKS)
+- ne_session * sess;
+-
+-assert(fd->req != NULL);
+- sess = ne_get_session(fd->req);
+-assert(sess != NULL);
+-
+- /* HACK: include ne_private.h to access sess->socket for now. */
+- xx = ne_sock_fullwrite(sess->socket, buf, count);
+-#else
+-#if defined(HAVE_NEON_NE_SEND_REQUEST_CHUNK) || defined(__LCLINT__)
-assert(fd->req != NULL);
- xx = ne_send_request_chunk(fd->req, buf, count);
+-#else
+- errno = EIO; /* HACK */
+- return -1;
+-#endif
+-#endif
-
- /* HACK: stupid error impedence matching. */
- rc = (xx == 0 ? count : -1);
-
-if (_dav_debug < 0)
--fprintf(stderr, "*** davWrite(%p,%p,0x%x) rc 0x%x\n", cookie, buf, count, rc);
+-fprintf(stderr, "*** davWrite(%p,%p,0x%x) rc 0x%x\n", cookie, buf, (unsigned)count, (unsigned)rc);
-#ifdef DYING
-if (count > 0)
-hexdump(buf, count);
-#endif
-
- return rc;
--#else
-- errno = EIO; /* HACK */
-- return -1;
--#endif
-}
-
-int davSeek(void * cookie, /*@unused@*/ _libio_pos_t pos, int whence)
- if (S_ISREG(st->st_mode)) {
- st->st_nlink = 1;
- st->st_mode |= 0644;
-- }
+- }
-
- /* XXX fts(3) needs/uses st_ino, make something up for now. */
- if (st->st_ino == 0)
- if (S_ISREG(st->st_mode)) {
- st->st_nlink = 1;
- st->st_mode |= 0644;
-- }
+- }
-
- /* XXX fts(3) needs/uses st_ino, make something up for now. */
- if (st->st_ino == 0)
/*@unchecked@*/
int avmagicdir = 0x3607113;
-@@ -1475,172 +166,3 @@
+@@ -1517,172 +166,3 @@
/*@=kepttrans@*/
}
/*@=boundswrite@*/
- dp->d_ino = i + 1; /* W2DO? */
- dp->d_reclen = 0; /* W2DO? */
-
--#if !defined(hpux) && !defined(sun)
+-#if !(defined(hpux) || defined(__hpux) || defined(sun))
-#if !defined(__APPLE__)
- dp->d_off = 0; /* W2DO? */
-#endif
- strncpy(dp->d_name, av[i], sizeof(dp->d_name));
-if (_dav_debug < 0)
-fprintf(stderr, "*** davReaddir(%p) %p \"%s\"\n", (void *)avdir, dp, dp->d_name);
--
+-
- return dp;
-}
-
-/*@=kepttrans@*/
-}
-/*@=modfilesys@*/
-diff -ur rpm-4.4.1/rpmio/rpmdav.h rpm-4.4.1-no-neon/rpmio/rpmdav.h
---- rpm-4.4.1/rpmio/rpmdav.h 2005-01-17 19:46:27.000000000 +0100
-+++ rpm-4.4.1-no-neon/rpmio/rpmdav.h 2005-06-19 20:39:46.034218000 +0200
-@@ -80,131 +80,6 @@
+--- rpm-4.4.3/rpmio/rpmdav.h.orig 2005-10-11 21:13:59.000000000 +0200
++++ rpm-4.4.3/rpmio/rpmdav.h 2005-11-19 01:07:54.224769056 +0100
+@@ -80,133 +80,6 @@
/*@globals fileSystem, internalState @*/
/*@modifies fileSystem, internalState @*/;
- * @retval *str error msg
- * @returns 0 on success
- */
+-/*@-exportlocal@*/
-int davResp(urlinfo u, FD_t ctrl, /*@out@*/ /*@null@*/ char *const * str)
- /*@globals fileSystem, internalState @*/
- /*@modifies ctrl, *str, fileSystem, internalState @*/;
+-/*@=exportlocal@*/
-
-/**
- */
#ifdef __cplusplus
}
#endif
-diff -ur rpm-4.4.1/rpmio/rpmio.c rpm-4.4.1-no-neon/rpmio/rpmio.c
---- rpm-4.4.1/rpmio/rpmio.c 2005-01-26 04:39:58.000000000 +0100
-+++ rpm-4.4.1-no-neon/rpmio/rpmio.c 2005-06-19 20:34:07.005758160 +0200
-@@ -104,11 +104,6 @@
- /**
- */
- /*@unchecked@*/
--static int httpTimeoutSecs = TIMEOUT_SECS;
--
--/**
-- */
--/*@unchecked@*/
- int _rpmio_debug = 0;
-
- /**
-@@ -369,13 +364,6 @@
+--- rpm-4.4.3/rpmio/rpmio.c.orig 2005-11-16 01:05:39.000000000 +0100
++++ rpm-4.4.3/rpmio/rpmio.c 2005-11-19 01:03:10.769860752 +0100
+@@ -371,13 +371,6 @@
fdstat_enter(fd, FDSTAT_READ);
/*@-boundswrite@*/
rc = read(fdFileno(fd), buf, (count > fd->bytesRemain ? fd->bytesRemain : count));
/*@=boundswrite@*/
fdstat_exit(fd, FDSTAT_READ, rc);
-@@ -403,10 +391,6 @@
+@@ -405,10 +398,6 @@
fdstat_enter(fd, FDSTAT_WRITE);
/*@-boundsread@*/
rc = write(fdno, buf, (count > fd->bytesRemain ? fd->bytesRemain : count));
/*@=boundsread@*/
fdstat_exit(fd, FDSTAT_WRITE, rc);
-@@ -453,11 +437,6 @@
+@@ -455,11 +444,6 @@
fdSetFdno(fd, -1);
fdstat_enter(fd, FDSTAT_CLOSE);
rc = ((fdno >= 0) ? close(fdno) : -2);
/*@=branchstate@*/
fdstat_exit(fd, FDSTAT_CLOSE, rc);
-@@ -509,10 +488,6 @@
+@@ -512,10 +496,6 @@
FD_ZERO(&wrfds);
#endif
if ((fdno = fdFileno(fd)) < 0)
return -1; /* XXX W2DO? */
-@@ -564,10 +539,6 @@
+@@ -567,10 +547,6 @@
FD_ZERO(&rdfds);
#endif
if ((fdno = fdFileno(fd)) < 0)
return -1; /* XXX W2DO? */
-@@ -1562,152 +1533,6 @@
+@@ -1566,154 +1542,6 @@
return rc;
}
+-#ifdef DEAD
-static int httpResp(urlinfo u, FD_t ctrl, /*@out@*/ char ** str)
- /*@globals fileSystem @*/
- /*@modifies ctrl, *str, fileSystem @*/
- return rc;
-/*@=usereleased@*/
-}
+-#endif
-
/* XXX DYING: unused */
void * ufdGetUrlinfo(FD_t fd)
{
-@@ -2064,29 +1889,6 @@
+@@ -2071,29 +1899,6 @@
fd->wr_chunked = 0;
}
break;
case URL_IS_DASH:
assert(!(flags & O_RDWR));
fd = fdDup( ((flags & O_WRONLY) ? STDOUT_FILENO : STDIN_FILENO) );
-@@ -2703,10 +2505,8 @@
+@@ -2711,10 +2516,8 @@
if (fd->nfps > 0 && fpno == -1 &&
fd->fps[fd->nfps-1].io == ufdio &&
fd->fps[fd->nfps-1].fp == fp &&
- (fd->fps[fd->nfps-1].fdno >= 0 || fd->req != NULL))
-+ fd->fps[fd->nfps-1].fdno >= 0)
++ (fd->fps[fd->nfps-1].fdno >= 0))
{
- int hadreqpersist = (fd->req != NULL);
-
if (fp)
rc = fflush(fp);
fd->nfps--;
-@@ -2716,26 +2516,9 @@
+@@ -2724,26 +2527,9 @@
/*@-usereleased@*/
if (fdGetFdno(fd) >= 0)
break;
rc = fclose(fp);
}
fdPop(fd);
-@@ -2984,18 +2767,9 @@
+@@ -2992,18 +2778,10 @@
return NULL;
}
} else {
- FILE *fp;
- int fdno;
- int isHTTP = 0;
--
+
/* XXX gzdio and bzdio here too */
switch (urlIsURL(path)) {
case URL_IS_PATH:
case URL_IS_DASH:
case URL_IS_FTP:
-@@ -3003,7 +2777,7 @@
+@@ -3011,7 +2789,7 @@
if (_rpmio_debug)
fprintf(stderr, "*** Fopen ufdio path %s fmode %s\n", path, fmode);
fd = ufdOpen(path, flags, perms);
return fd;
break;
default:
-@@ -3012,15 +2786,6 @@
+@@ -3020,15 +2798,6 @@
return NULL;
/*@notreached@*/ break;
}
}
/*@=branchstate@*/
-@@ -3056,10 +2821,6 @@
+@@ -3064,10 +2833,6 @@
int i, rc = 0;
if (fd == NULL) return -1;
for (i = fd->nfps; rc == 0 && i >= 0; i--) {
/*@-boundsread@*/
FDSTACK_t * fps = &fd->fps[i];
-@@ -3094,9 +2855,6 @@
+@@ -3102,9 +2867,6 @@
{
int i, rc = -1;
projects / packages / rpm.git / blobdiff