circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-10-13 06:04:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5389 from YayoRazo/fix/prompt-history-getline

Browse Source 
fix(compat): drop fgetln compat shim, migrate prompt-history.c to getline
This commit is contained in:
Nicholas Marriott
2026-07-13 21:25:10 +01:00
committed by GitHub
parent 2f0308ea4d c3e38b317d
commit 2818069d5f
3 changed files with 0 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
compat.h
View File

@@ -410,11 +410,6 @@ int asprintf(char **, const char *, ...);
int vasprintf(char **, const char *, va_list); int vasprintf(char **, const char *, va_list);
#endif #endif
#ifndef HAVE_FGETLN
/* fgetln.c */
char *fgetln(FILE *, size_t *);
#endif
#ifndef HAVE_GETLINE #ifndef HAVE_GETLINE
/* getline.c */ /* getline.c */
ssize_t getline(char **, size_t *, FILE *); ssize_t getline(char **, size_t *, FILE *);

61
compat/fgetln.c
View File

@@ -1,61 +0,0 @@
/*
* Copyright (c) 2015 Joerg Jung <jung@openbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/*
* portable fgetln() version, NOT reentrant
*/
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include "compat.h"
char *
fgetln(FILE *fp, size_t *len)
{
static char *buf = NULL;
static size_t bufsz = 0;
size_t r = 0;
char *p;
int c, e;
if (!fp || !len) {
errno = EINVAL;
return NULL;
}
if (!buf) {
if (!(buf = calloc(1, BUFSIZ)))
return NULL;
bufsz = BUFSIZ;
}
while ((c = getc(fp)) != EOF) {
buf[r++] = c;
if (r == bufsz) {
if (!(p = reallocarray(buf, 2, bufsz))) {
e = errno;
free(buf);
errno = e;
buf = NULL, bufsz = 0;
return NULL;
}
buf = p, bufsz = 2 * bufsz;
}
if (c == '\n')
break;
}
return (*len = r) ? buf : NULL;
}

1
configure.ac
View File

@@ -177,7 +177,6 @@ AC_REPLACE_FUNCS([ \
clock_gettime \ clock_gettime \
closefrom \ closefrom \
explicit_bzero \ explicit_bzero \
fgetln \
freezero \ freezero \
getdtablecount \ getdtablecount \
getdtablesize \ getdtablesize \