oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(krb5_storage_from_fd): dup the file descriptor so we don't have to

Browse Source 
keep track of it in two places


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@13795 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2004-04-25 21:27:34 +00:00
parent 1be4ca7ac2
commit f3dc346f5d
1 changed files with 43 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
lib/krb5/store_fd.c
View File

@@ -1,34 +1,34 @@
/* /*
* Copyright (c) 1997 - 2002 Kungliga Tekniska H<>gskolan * Copyright (c) 1997 - 2004 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
* are met: * are met:
* *
* 1. Redistributions of source code must retain the above copyright * 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* *
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* *
* 3. Neither the name of the Institute nor the names of its contributors * 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software * may be used to endorse or promote products derived from this software
* without specific prior written permission. * without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include "krb5_locl.h" #include "krb5_locl.h"
@@ -36,34 +36,45 @@
RCSID("$Id$"); RCSID("$Id$");
typedef struct fd_storage{ typedef struct fd_storage {
int fd; int fd;
}fd_storage; } fd_storage;
#define FD(S) (((fd_storage*)(S)->data)->fd) #define FD(S) (((fd_storage*)(S)->data)->fd)
static ssize_t static ssize_t
fd_fetch(krb5_storage *sp, void *data, size_t size) fd_fetch(krb5_storage * sp, void *data, size_t size)
{ {
return net_read(FD(sp), data, size); return net_read(FD(sp), data, size);
} }
static ssize_t static ssize_t
fd_store(krb5_storage *sp, const void *data, size_t size) fd_store(krb5_storage * sp, const void *data, size_t size)
{ {
return net_write(FD(sp), data, size); return net_write(FD(sp), data, size);
} }
static off_t static off_t
fd_seek(krb5_storage *sp, off_t offset, int whence) fd_seek(krb5_storage * sp, off_t offset, int whence)
{ {
return lseek(FD(sp), offset, whence); return lseek(FD(sp), offset, whence);
} }
static void
fd_free(krb5_storage * sp)
{
close(FD(sp));
}
krb5_storage * krb5_storage *
krb5_storage_from_fd(int fd) krb5_storage_from_fd(int fd)
{ {
krb5_storage *sp = malloc(sizeof(krb5_storage)); krb5_storage *sp;
fd = dup(fd);
if (fd < 0)
return NULL;
sp = malloc(sizeof(krb5_storage));
if (sp == NULL) if (sp == NULL)
return NULL; return NULL;
@@ -79,6 +90,6 @@ krb5_storage_from_fd(int fd)
sp->fetch = fd_fetch; sp->fetch = fd_fetch;
sp->store = fd_store; sp->store = fd_store;
sp->seek = fd_seek; sp->seek = fd_seek;
sp->free = NULL; sp->free = fd_free;
return sp; return sp;
} }