stdio: lose "glue.h".
But keep the concept for now, because there's more refactoring needed before we can try to remove this (with the motivation being "so we can address the concurrency issues inherent in using `_flags == 0` as a freelist").
Change-Id: I2de374f4b6c2c9c99e444bf4b525503c9ede68fa
diff --git a/libc/stdio/glue.h b/libc/stdio/glue.h
deleted file mode 100644
index cb1d182..0000000
--- a/libc/stdio/glue.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* $OpenBSD: glue.h,v 1.4 2004/01/11 21:39:51 millert Exp $ */
-
-/*-
- * Copyright (c) 1990, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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 <sys/cdefs.h>
-
-__BEGIN_DECLS
-
-/*
- * The first few FILEs are statically allocated; others are dynamically
- * allocated and linked in via this glue structure.
- */
-struct glue {
- struct glue *next;
- int niobs;
- FILE *iobs;
-};
-
-/* This was referenced by a couple of different pieces of middleware and the Crystax NDK. */
-__LIBC32_LEGACY_PUBLIC__ extern struct glue __sglue;
-
-__END_DECLS
diff --git a/libc/stdio/local.h b/libc/stdio/local.h
index 0729b7e..5be3045 100644
--- a/libc/stdio/local.h
+++ b/libc/stdio/local.h
@@ -199,6 +199,9 @@
__LIBC32_LEGACY_PUBLIC__ int __sclose(void*);
__LIBC32_LEGACY_PUBLIC__ int _fwalk(int (*)(FILE*));
+/* This was referenced by a couple of different pieces of middleware and the Crystax NDK. */
+__LIBC32_LEGACY_PUBLIC__ extern struct glue __sglue;
+
off64_t __sseek64(void*, off64_t, int);
int __sflush_locked(FILE*);
void __swhatbuf(FILE*, size_t*, int*);
diff --git a/libc/stdio/stdio.cpp b/libc/stdio/stdio.cpp
index 2fe9af5..6bc2aee 100644
--- a/libc/stdio/stdio.cpp
+++ b/libc/stdio/stdio.cpp
@@ -49,7 +49,6 @@
#include <async_safe/log.h>
-#include "glue.h"
#include "local.h"
#include "private/ErrnoRestorer.h"
#include "private/FdPath.h"
@@ -119,6 +118,14 @@
reinterpret_cast<uint64_t>(fp));
}
+// The first few FILEs are statically allocated; others are dynamically
+// allocated and linked in via this glue structure.
+// TODO: replace this with an intrusive doubly-linked list of the FILE*s (via _EXT())
+struct glue {
+ struct glue* next;
+ int niobs;
+ FILE* iobs;
+};
struct glue __sglue = { nullptr, 3, __sF };
static struct glue* lastglue = &__sglue;
