mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-09 04:11:27 +08:00
c4f50205e1
This patch fixes various places where a space should have been present before '(' in accordance with the GNU Coding Standards. Most but not all of the fixes in this patch are for calls to sizeof (but it's not exhaustive regarding such calls that should be fixed). Tested for x86_64, and with build-many-glibcs.py. * benchtests/bench-strcpy.c (do_test): Use space before '('. * benchtests/bench-string.h (cmdline_process_function): Likewise. * benchtests/bench-strlen.c (do_test): Likewise. (test_main): Likewise. * catgets/gencat.c (read_old): Likewise. * elf/cache.c (load_aux_cache): Likewise. * iconvdata/bug-iconv8.c (do_test): Likewise. * math/test-tgmath-ret.c (do_test): Likewise. * nis/nis_call.c (rec_dirsearch): Likewise. * nis/nis_findserv.c (__nis_findfastest_with_timeout): Likewise. * nptl/tst-audit-threads.c (do_test): Likewise. * nptl/tst-cancel4-common.h (set_socket_buffer): Likewise. * nss/nss_test1.c (init): Likewise. * nss/test-netdb.c (test_hosts): Likewise. * posix/execvpe.c (maybe_script_execute): Likewise. * stdio-common/tst-fmemopen4.c (do_test): Likewise. * stdio-common/tst-printf.c (do_test): Likewise. * stdio-common/vfscanf-internal.c (__vfscanf_internal): Likewise. * stdlib/fmtmsg.c (NKEYWORDS): Likewise. * stdlib/qsort.c (STACK_SIZE): Likewise. * stdlib/test-canon.c (do_test): Likewise. * stdlib/tst-swapcontext1.c (do_test): Likewise. * string/memcmp.c (OPSIZ): Likewise. * string/test-strcpy.c (do_test): Likewise. (do_random_tests): Likewise. * string/test-strlen.c (do_test): Likewise. (test_main): Likewise. * string/test-strrchr.c (do_test): Likewise. (do_random_tests): Likewise. * string/tester.c (test_memrchr): Likewise. (test_memchr): Likewise. * sysdeps/generic/memcopy.h (OPSIZ): Likewise. * sysdeps/generic/unwind-dw2.c (execute_stack_op): Likewise. * sysdeps/generic/unwind-pe.h (read_sleb128): Likewise. (read_encoded_value_with_base): Likewise. * sysdeps/hppa/dl-machine.h (elf_machine_runtime_setup): Likewise. * sysdeps/hppa/fpu/feupdateenv.c (__feupdateenv): Likewise. * sysdeps/ia64/fpu/sfp-machine.h (TI_BITS): Likewise. * sysdeps/mach/hurd/spawni.c (__spawni): Likewise. * sysdeps/posix/spawni.c (maybe_script_execute): Likewise. * sysdeps/powerpc/fpu/tst-setcontext-fpscr.c (query_auxv): Likewise. * sysdeps/unix/sysv/linux/aarch64/bits/procfs.h (ELF_NGREG): Likewise. * sysdeps/unix/sysv/linux/arm/bits/procfs.h (ELF_NGREG): Likewise. * sysdeps/unix/sysv/linux/arm/ioperm.c (init_iosys): Likewise. * sysdeps/unix/sysv/linux/csky/bits/procfs.h (ELF_NGREG): Likewise. * sysdeps/unix/sysv/linux/m68k/bits/procfs.h (ELF_NGREG): Likewise. * sysdeps/unix/sysv/linux/nios2/bits/procfs.h (ELF_NGREG): Likewise. * sysdeps/unix/sysv/linux/spawni.c (maybe_script_execute): Likewise. * sysdeps/unix/sysv/linux/x86/bits/procfs.h (ELF_NGREG): Likewise. * sysdeps/unix/sysv/linux/x86/bits/sigcontext.h (FP_XSTATE_MAGIC2_SIZE): Likewise. * sysdeps/x86/fpu/sfp-machine.h (TI_BITS): Likewise. * time/test_time.c (main): Likewise.
236 lines
6.2 KiB
C
236 lines
6.2 KiB
C
/* Test program for returning the canonical absolute name of a given file.
|
|
Copyright (C) 1996-2019 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by David Mosberger <davidm@azstarnet.com>.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library 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
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
/* This file must be run from within a directory called "stdlib". */
|
|
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <sys/param.h>
|
|
#include <sys/stat.h>
|
|
|
|
/* Prototype for our test function. */
|
|
extern int do_test (int argc, char *argv[]);
|
|
#include <test-skeleton.c>
|
|
|
|
#ifndef PATH_MAX
|
|
# define PATH_MAX 4096
|
|
#endif
|
|
static char cwd[PATH_MAX];
|
|
static size_t cwd_len;
|
|
|
|
struct {
|
|
const char * name;
|
|
const char * value;
|
|
} symlinks[] = {
|
|
{"SYMLINK_LOOP", "SYMLINK_LOOP"},
|
|
{"SYMLINK_1", "."},
|
|
{"SYMLINK_2", "//////./../../etc"},
|
|
{"SYMLINK_3", "SYMLINK_1"},
|
|
{"SYMLINK_4", "SYMLINK_2"},
|
|
{"SYMLINK_5", "doesNotExist"},
|
|
};
|
|
|
|
struct {
|
|
const char * in, * out, * resolved;
|
|
int error;
|
|
} tests[] = {
|
|
/* 0 */
|
|
{"/", "/"},
|
|
{"/////////////////////////////////", "/"},
|
|
{"/.././.././.././..///", "/"},
|
|
{"/etc", "/etc"},
|
|
{"/etc/../etc", "/etc"},
|
|
/* 5 */
|
|
{"/doesNotExist/../etc", 0, "/doesNotExist", ENOENT},
|
|
{"./././././././././.", "."},
|
|
{"/etc/.//doesNotExist", 0, "/etc/doesNotExist", ENOENT},
|
|
{"./doesExist", "./doesExist"},
|
|
{"./doesExist/", "./doesExist"},
|
|
/* 10 */
|
|
{"./doesExist/../doesExist", "./doesExist"},
|
|
{"foobar", 0, "./foobar", ENOENT},
|
|
{".", "."},
|
|
{"./foobar", 0, "./foobar", ENOENT},
|
|
{"SYMLINK_LOOP", 0, "./SYMLINK_LOOP", ELOOP},
|
|
/* 15 */
|
|
{"./SYMLINK_LOOP", 0, "./SYMLINK_LOOP", ELOOP},
|
|
{"SYMLINK_1", "."},
|
|
{"SYMLINK_1/foobar", 0, "./foobar", ENOENT},
|
|
{"SYMLINK_2", "/etc"},
|
|
{"SYMLINK_3", "."},
|
|
/* 20 */
|
|
{"SYMLINK_4", "/etc"},
|
|
{"../stdlib/SYMLINK_1", "."},
|
|
{"../stdlib/SYMLINK_2", "/etc"},
|
|
{"../stdlib/SYMLINK_3", "."},
|
|
{"../stdlib/SYMLINK_4", "/etc"},
|
|
/* 25 */
|
|
{"./SYMLINK_5", 0, "./doesNotExist", ENOENT},
|
|
{"SYMLINK_5", 0, "./doesNotExist", ENOENT},
|
|
{"SYMLINK_5/foobar", 0, "./doesNotExist", ENOENT},
|
|
{"doesExist/../../stdlib/doesExist", "./doesExist"},
|
|
{"doesExist/.././../stdlib/.", "."},
|
|
/* 30 */
|
|
{"./doesExist/someFile/", 0, "./doesExist/someFile", ENOTDIR},
|
|
{"./doesExist/someFile/..", 0, "./doesExist/someFile", ENOTDIR},
|
|
};
|
|
|
|
|
|
static int
|
|
check_path (const char * result, const char * expected)
|
|
{
|
|
int good;
|
|
|
|
if (!result)
|
|
return (expected == NULL);
|
|
|
|
if (!expected)
|
|
return 0;
|
|
|
|
if (expected[0] == '.' && (expected[1] == '/' || expected[1] == '\0'))
|
|
good = (strncmp (result, cwd, cwd_len) == 0
|
|
&& strcmp (result + cwd_len, expected + 1) == 0);
|
|
else
|
|
good = (strcmp (expected, result) == 0);
|
|
|
|
return good;
|
|
}
|
|
|
|
|
|
int
|
|
do_test (int argc, char ** argv)
|
|
{
|
|
char * result;
|
|
int i, errors = 0;
|
|
char buf[PATH_MAX];
|
|
|
|
getcwd (cwd, sizeof (buf));
|
|
cwd_len = strlen (cwd);
|
|
|
|
errno = 0;
|
|
if (realpath (NULL, buf) != NULL || errno != EINVAL)
|
|
{
|
|
printf ("%s: expected return value NULL and errno set to EINVAL"
|
|
" for realpath(NULL,...)\n", argv[0]);
|
|
++errors;
|
|
}
|
|
|
|
#if 0
|
|
/* This is now allowed. The test is invalid. */
|
|
errno = 0;
|
|
if (realpath ("/", NULL) != NULL || errno != EINVAL)
|
|
{
|
|
printf ("%s: expected return value NULL and errno set to EINVAL"
|
|
" for realpath(...,NULL)\n", argv[0]);
|
|
++errors;
|
|
}
|
|
#endif
|
|
|
|
errno = 0;
|
|
if (realpath ("", buf) != NULL || errno != ENOENT)
|
|
{
|
|
printf ("%s: expected return value NULL and set errno to ENOENT"
|
|
" for realpath(\"\",...)\n", argv[0]);
|
|
++errors;
|
|
}
|
|
|
|
for (i = 0; i < (int) (sizeof (symlinks) / sizeof (symlinks[0])); ++i)
|
|
symlink (symlinks[i].value, symlinks[i].name);
|
|
|
|
int has_dir = mkdir ("doesExist", 0777) == 0;
|
|
|
|
int fd = has_dir ? creat ("doesExist/someFile", 0777) : -1;
|
|
|
|
for (i = 0; i < (int) (sizeof (tests) / sizeof (tests[0])); ++i)
|
|
{
|
|
buf[0] = '\0';
|
|
result = realpath (tests[i].in, buf);
|
|
|
|
if (!check_path (result, tests[i].out))
|
|
{
|
|
printf ("%s: flunked test %d (expected `%s', got `%s')\n",
|
|
argv[0], i, tests[i].out ? tests[i].out : "NULL",
|
|
result ? result : "NULL");
|
|
++errors;
|
|
continue;
|
|
}
|
|
|
|
if (!check_path (buf, tests[i].out ? tests[i].out : tests[i].resolved))
|
|
{
|
|
printf ("%s: flunked test %d (expected resolved `%s', got `%s')\n",
|
|
argv[0], i, tests[i].out ? tests[i].out : tests[i].resolved,
|
|
buf);
|
|
++errors;
|
|
continue;
|
|
}
|
|
|
|
if (!tests[i].out && errno != tests[i].error)
|
|
{
|
|
printf ("%s: flunked test %d (expected errno %d, got %d)\n",
|
|
argv[0], i, tests[i].error, errno);
|
|
++errors;
|
|
continue;
|
|
}
|
|
|
|
char *result2 = realpath (tests[i].in, NULL);
|
|
if ((result2 == NULL && result != NULL)
|
|
|| (result2 != NULL && strcmp (result, result2) != 0))
|
|
{
|
|
printf ("\
|
|
%s: realpath(..., NULL) produced different result than realpath(..., buf): '%s' vs '%s'\n",
|
|
argv[0], result2, result);
|
|
++errors;
|
|
}
|
|
free (result2);
|
|
}
|
|
|
|
getcwd (buf, sizeof (buf));
|
|
if (strcmp (buf, cwd))
|
|
{
|
|
printf ("%s: current working directory changed from %s to %s\n",
|
|
argv[0], cwd, buf);
|
|
++errors;
|
|
}
|
|
|
|
if (fd >= 0)
|
|
{
|
|
close (fd);
|
|
unlink ("doesExist/someFile");
|
|
}
|
|
|
|
if (has_dir)
|
|
rmdir ("doesExist");
|
|
|
|
for (i = 0; i < (int) (sizeof (symlinks) / sizeof (symlinks[0])); ++i)
|
|
unlink (symlinks[i].name);
|
|
|
|
if (errors != 0)
|
|
{
|
|
printf ("%d errors.\n", errors);
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
puts ("No errors.");
|
|
return EXIT_SUCCESS;
|
|
}
|