Revert "Mes C Library: m2/getcwd.c: Remove specialization."

This reverts commit 37f44ce9453ef5589b1336c981360de16c154999.
This commit is contained in:
Jan (janneke) Nieuwenhuizen 2021-01-01 15:54:13 +01:00
parent b23c6885a6
commit c881e18dae
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
4 changed files with 49 additions and 14 deletions

View file

@ -91,7 +91,7 @@ M2-Planet \
-f lib/m2/clock_gettime.c \ -f lib/m2/clock_gettime.c \
-f lib/m2/time.c \ -f lib/m2/time.c \
-f lib/linux/_getcwd.c \ -f lib/linux/_getcwd.c \
-f lib/posix/getcwd.c \ -f lib/m2/getcwd.c \
-f lib/linux/dup.c \ -f lib/linux/dup.c \
-f lib/linux/dup2.c \ -f lib/linux/dup2.c \
-f lib/string/strcmp.c \ -f lib/string/strcmp.c \

42
lib/m2/getcwd.c Normal file
View file

@ -0,0 +1,42 @@
/* -*-comment-start: "//";comment-end:""-*-
* GNU Mes --- Maxwell Equations of Software
* Copyright © 2016,2017,2018,2019,2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
*
* This file is part of GNU Mes.
*
* GNU Mes is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or (at
* your option) any later version.
*
* GNU Mes is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with GNU Mes. If not, see <http://www.gnu.org/licenses/>.
*/
#include <mes/lib.h>
#include <mes/mes.h>
#include <limits.h>
#include <stdlib.h>
#include <sys/types.h>
// CONSTANT PATH_MAX 1024
char *__getcwd_buf;
char *
getcwd (char *buffer, int size)
{
if (buffer == 0)
buffer = __getcwd_buf;
if (buffer == 0)
{
__getcwd_buf = malloc (PATH_MAX);
buffer = __getcwd_buf;
}
return _getcwd (buffer, size);
}

View file

@ -19,24 +19,17 @@
*/ */
#include <mes/lib.h> #include <mes/lib.h>
#include <mes/mes.h>
#include <limits.h> #include <limits.h>
#include <stdlib.h>
#include <sys/types.h> #include <sys/types.h>
#include <mes/lib.h>
// CONSTANT PATH_MAX 1024
char *__getcwd_buf; char *__getcwd_buf;
char * char *
getcwd (char *buffer, int size) getcwd (char *buffer, size_t size)
{ {
static char buf[PATH_MAX];
if (buffer == 0) if (buffer == 0)
buffer = __getcwd_buf; buffer = buf;
if (buffer == 0)
{
__getcwd_buf = malloc (PATH_MAX);
buffer = __getcwd_buf;
}
return _getcwd (buffer, size); return _getcwd (buffer, size);
} }

View file

@ -1,6 +1,6 @@
# GNU Mes --- Maxwell Equations of Software # GNU Mes --- Maxwell Equations of Software
# Copyright © 2019 Jeremiah Orians <jeremiah@pdp10.guru> # Copyright © 2019 Jeremiah Orians <jeremiah@pdp10.guru>
# Copyright © 2018,2019,2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> # Copyright © 2018,2019,2020,2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
# #
# This file is part of GNU Mes. # This file is part of GNU Mes.
# #
@ -129,7 +129,7 @@ M2_SOURCES = \
lib/m2/clock_gettime.c \ lib/m2/clock_gettime.c \
lib/m2/time.c \ lib/m2/time.c \
lib/linux/_getcwd.c \ lib/linux/_getcwd.c \
lib/posix/getcwd.c \ lib/m2/getcwd.c \
lib/linux/dup.c \ lib/linux/dup.c \
lib/linux/dup2.c \ lib/linux/dup2.c \
lib/string/strcmp.c \ lib/string/strcmp.c \