diff options
| author | Roy Marples <roy@marples.name> | 2017-03-21 20:30:49 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2017-03-21 20:30:49 +0000 |
| commit | 9cd0b3a7ce0cff3a2bbdf93a76f919c97bc59529 (patch) | |
| tree | 8a0fa5fcca943e4b614dbfa5e4c6f5fa111a255f /compat | |
| parent | 5b1a47b93ecabbf6a59be4a7a390197a085dd21c (diff) | |
| download | dhcpcd-9cd0b3a7ce0cff3a2bbdf93a76f919c97bc59529.tar.xz | |
Remove getline(3) compat code.
All supported OS's have this in libc now.
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/getline.c | 75 | ||||
| -rw-r--r-- | compat/getline.h | 36 |
2 files changed, 0 insertions, 111 deletions
diff --git a/compat/getline.c b/compat/getline.c deleted file mode 100644 index 8c0cbdff..00000000 --- a/compat/getline.c +++ /dev/null @@ -1,75 +0,0 @@ -/* - * dhcpcd - DHCP client daemon - * Copyright (c) 2006-2009 Roy Marples <roy@marples.name> - * All rights reserved - - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * 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 - * SUCH DAMAGE. - */ - -#include <errno.h> -#include <stdint.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> - -#include "getline.h" - -/* Redefine a small buffer for our simple text config files */ -#undef BUFSIZ -#define BUFSIZ 128 - -ssize_t -getline(char ** __restrict buf, size_t * __restrict buflen, - FILE * __restrict fp) -{ - size_t bytes, newlen; - char *newbuf, *p; - - if (buf == NULL || buflen == NULL) { - errno = EINVAL; - return -1; - } - if (*buf == NULL) - *buflen = 0; - - bytes = 0; - do { - if (feof(fp)) - break; - if (*buf == NULL || bytes != 0 || *buflen < BUFSIZ) { - newlen = *buflen + BUFSIZ; - newbuf = realloc(*buf, newlen); - if (newbuf == NULL) - return -1; - *buf = newbuf; - *buflen = newlen; - } - p = *buf + bytes; - memset(p, 0, BUFSIZ); - if (fgets(p, BUFSIZ, fp) == NULL) - break; - bytes += strlen(p); - } while (bytes == 0 || *(*buf + (bytes - 1)) != '\n'); - if (bytes == 0) - return -1; - return bytes; -} diff --git a/compat/getline.h b/compat/getline.h deleted file mode 100644 index 3db807a8..00000000 --- a/compat/getline.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * dhcpcd - DHCP client daemon - * Copyright (c) 2006-2009 Roy Marples <roy@marples.name> - * All rights reserved - - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * 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 - * SUCH DAMAGE. - */ - -#ifndef GETLINE_H -#define GETLINE_H - -#include <sys/types.h> -#include <stdio.h> - -ssize_t getline(char ** __restrict buf, size_t * __restrict buflen, - FILE * __restrict fp); -#endif |
