diff options
| -rw-r--r-- | libgloss/riscv/crt0.S | 39 | ||||
| -rw-r--r-- | newlib/libc/machine/riscv/rv_string.h (renamed from newlib/libc/machine/riscv/sys/string.h) | 8 | ||||
| -rw-r--r-- | newlib/libc/machine/riscv/stpcpy.c | 2 | ||||
| -rw-r--r-- | newlib/libc/machine/riscv/strcmp.S | 9 | ||||
| -rw-r--r-- | newlib/libc/machine/riscv/strcpy.c | 2 | ||||
| -rw-r--r-- | newlib/libc/machine/riscv/strlen.c | 2 | ||||
| -rw-r--r-- | newlib/libc/machine/riscv/sys/asm.h | 4 | ||||
| -rw-r--r-- | newlib/libc/machine/riscv/xlenint.h | 14 | ||||
| -rw-r--r-- | winsup/cygwin/Makefile.am | 1 | ||||
| -rw-r--r-- | winsup/cygwin/aarch64/fastcwd.cc | 207 | ||||
| -rw-r--r-- | winsup/cygwin/path.cc | 27 | ||||
| -rw-r--r-- | winsup/testsuite/winsup.api/ltp/sbrk01.c | 2 | ||||
| -rw-r--r-- | winsup/testsuite/winsup.api/ltp/symlink01.c | 172 |
13 files changed, 371 insertions, 118 deletions
diff --git a/libgloss/riscv/crt0.S b/libgloss/riscv/crt0.S index 54443e4..aa5ac36 100644 --- a/libgloss/riscv/crt0.S +++ b/libgloss/riscv/crt0.S @@ -27,8 +27,13 @@ _start: .option pop /* Initialize jvt CSR (reg addr: 0x0017) */ +#ifndef __riscv_cmodel_large .weak __jvt_base$ lla a0, __jvt_base$ +#else + la a0, .Laddr_jvt_base + ld a0, 0(a0) +#endif beqz a0, .Ljvt_init_end .option push .option norelax @@ -38,21 +43,38 @@ _start: .Ljvt_init_end: # Clear the bss segment +#ifndef __riscv_cmodel_large la a0, __bss_start la a2, _end +#else + la a0, .Laddr_bss_start + ld a0, 0(a0) + la a2, .Laddr_end + ld a2, 0(a2) +#endif sub a2, a2, a0 li a1, 0 call memset #ifdef _LITE_EXIT # Make reference to atexit weak to avoid unconditionally pulling in # support code. Refer to comments in __atexit.c for more details. +#ifndef __riscv_cmodel_large .weak atexit la a0, atexit +#else + la a0, .Laddr_atexit + ld a0, 0(a0) +#endif beqz a0, .Lweak_atexit .weak __libc_fini_array #endif +#ifndef __riscv_cmodel_large la a0, __libc_fini_array # Register global termination functions +#else + la a0, .Laddr_libc_fini_array + ld a0, 0(a0) +#endif call atexit # to be called upon exit #ifdef _LITE_EXIT .Lweak_atexit: @@ -66,4 +88,21 @@ _start: add a2, a2, a1 # a2 = envp call main tail exit +#ifdef __riscv_cmodel_large +.Laddr_gp: + .dword __global_pointer$ +.Laddr_jvt_base: + .weak __jvt_base$ + .dword __jvt_base$ +.Laddr_bss_start: + .dword __bss_start +.Laddr_end: + .dword _end +.Laddr_atexit: + .weak atexit + .dword atexit +.Laddr_libc_fini_array: + .weak __libc_fini_array + .dword __libc_fini_array +#endif .size _start, .-_start diff --git a/newlib/libc/machine/riscv/sys/string.h b/newlib/libc/machine/riscv/rv_string.h index b65635c..362f66a 100644 --- a/newlib/libc/machine/riscv/sys/string.h +++ b/newlib/libc/machine/riscv/rv_string.h @@ -9,11 +9,11 @@ http://www.opensource.org/licenses. */ -#ifndef _SYS_STRING_H -#define _SYS_STRING_H +#ifndef _RV_STRING_H +#define _RV_STRING_H #include <stdbool.h> -#include "asm.h" +#include "xlenint.h" #if __riscv_zbb #include <riscv_bitmanip.h> @@ -121,4 +121,4 @@ static __inline char *__libc_strcpy(char *dst, const char *src, bool ret_start) } -#endif +#endif /* _RV_STRING_H */ diff --git a/newlib/libc/machine/riscv/stpcpy.c b/newlib/libc/machine/riscv/stpcpy.c index 9243457..14c3222 100644 --- a/newlib/libc/machine/riscv/stpcpy.c +++ b/newlib/libc/machine/riscv/stpcpy.c @@ -1,5 +1,5 @@ -#include <string.h> #include <stdbool.h> +#include "rv_string.h" char *stpcpy(char *dst, const char *src) { diff --git a/newlib/libc/machine/riscv/strcmp.S b/newlib/libc/machine/riscv/strcmp.S index 12c39db..cc29b7b 100644 --- a/newlib/libc/machine/riscv/strcmp.S +++ b/newlib/libc/machine/riscv/strcmp.S @@ -188,9 +188,16 @@ strcmp: foundnull 1 3 foundnull 2 3 #endif +#ifdef __riscv_cmodel_large + # Put the data within the funciton for large code model to prevent + # the data put too far. +.align 3 +mask: +.dword 0x7f7f7f7f7f7f7f7f +#endif .size strcmp, .-strcmp -#if SZREG == 8 +#if SZREG == 8 && !defined(__riscv_cmodel_large) .section .srodata.cst8,"aM",@progbits,8 .align 3 mask: diff --git a/newlib/libc/machine/riscv/strcpy.c b/newlib/libc/machine/riscv/strcpy.c index f770493..a05ec1c 100644 --- a/newlib/libc/machine/riscv/strcpy.c +++ b/newlib/libc/machine/riscv/strcpy.c @@ -9,8 +9,8 @@ http://www.opensource.org/licenses. */ -#include <string.h> #include <stdbool.h> +#include "rv_string.h" char *strcpy(char *dst, const char *src) { diff --git a/newlib/libc/machine/riscv/strlen.c b/newlib/libc/machine/riscv/strlen.c index 7e5d416..9bfd2a1 100644 --- a/newlib/libc/machine/riscv/strlen.c +++ b/newlib/libc/machine/riscv/strlen.c @@ -11,7 +11,7 @@ #include <string.h> #include <stdint.h> -#include "sys/asm.h" +#include "rv_string.h" size_t strlen(const char *str) { diff --git a/newlib/libc/machine/riscv/sys/asm.h b/newlib/libc/machine/riscv/sys/asm.h index 0a354b2..8c8aeb3 100644 --- a/newlib/libc/machine/riscv/sys/asm.h +++ b/newlib/libc/machine/riscv/sys/asm.h @@ -12,8 +12,6 @@ #ifndef _SYS_ASM_H #define _SYS_ASM_H -#include <stdint.h> - /* * Macros to handle different pointer/register sizes for 32/64-bit code */ @@ -22,13 +20,11 @@ # define SZREG 8 # define REG_S sd # define REG_L ld -typedef uint64_t uintxlen_t; #elif __riscv_xlen == 32 # define PTRLOG 2 # define SZREG 4 # define REG_S sw # define REG_L lw -typedef uint32_t uintxlen_t; #else # error __riscv_xlen must equal 32 or 64 #endif diff --git a/newlib/libc/machine/riscv/xlenint.h b/newlib/libc/machine/riscv/xlenint.h new file mode 100644 index 0000000..86363a8 --- /dev/null +++ b/newlib/libc/machine/riscv/xlenint.h @@ -0,0 +1,14 @@ +#ifndef _XLENINT_H +#define _XLENINT_H + +#include <stdint.h> + +#if __riscv_xlen == 64 +typedef uint64_t uintxlen_t; +#elif __riscv_xlen == 32 +typedef uint32_t uintxlen_t; +#else +# error __riscv_xlen must equal 32 or 64 +#endif + +#endif /* _XLENINT_H */ diff --git a/winsup/cygwin/Makefile.am b/winsup/cygwin/Makefile.am index fdd026a..6438a41 100644 --- a/winsup/cygwin/Makefile.am +++ b/winsup/cygwin/Makefile.am @@ -52,6 +52,7 @@ if TARGET_X86_64 TARGET_FILES= \ x86_64/bcopy.S \ x86_64/fastcwd.cc \ + aarch64/fastcwd.cc \ x86_64/memchr.S \ x86_64/memcpy.S \ x86_64/memmove.S \ diff --git a/winsup/cygwin/aarch64/fastcwd.cc b/winsup/cygwin/aarch64/fastcwd.cc new file mode 100644 index 0000000..e53afc0 --- /dev/null +++ b/winsup/cygwin/aarch64/fastcwd.cc @@ -0,0 +1,207 @@ +/* aarch64/fastcwd.cc: find the fast cwd pointer on aarch64 hosts. + + This file is part of Cygwin. + + This software is a copyrighted work licensed under the terms of the + Cygwin license. Please consult the file "CYGWIN_LICENSE" for + details. */ + +/* You might well wonder why this file is included in x86_64 target files + in Makefile.am. It turns out that this code works when built for i686, + x86_64, or aarch64 with just the small #if/#elif block in + GetArm64ProcAddress below caring which. */ + +#include "winsup.h" +#include <assert.h> + +class fcwd_access_t; + +static LPCVOID +GetArm64ProcAddress (HMODULE hModule, LPCSTR procname) +{ + const BYTE *proc = (const BYTE *) GetProcAddress (hModule, procname); +#if defined (__aarch64__) + return proc; +#else +#if defined (__i386__) + static const BYTE thunk[] = "\x8b\xff\x55\x8b\xec\x5d\x90\xe9"; + static const BYTE thunk2[0]; +#elif defined (__x86_64__) + /* see + https://learn.microsoft.com/en-us/windows/arm/arm64ec-abi#fast-forward-sequences */ + static const BYTE thunk[] = "\x48\x8b\xc4\x48\x89\x58\x20\x55\x5d\xe9"; + /* on windows 11 22000 the thunk is different than documented on that page */ + static const BYTE thunk2[] = "\x48\x8b\xff\x55\x48\x8b\xec\x5d\x90\xe9"; +#else +#error "Unhandled architecture for thunk detection" +#endif + if (proc && (memcmp (proc, thunk, sizeof (thunk) - 1) == 0 || + (sizeof(thunk2) && memcmp (proc, thunk2, sizeof (thunk2) - 1) == 0))) + { + proc += sizeof (thunk) - 1; + proc += 4 + *(const int32_t *) proc; + } + return proc; +#endif +} + +/* these ids and masks, as well as the names of the various other parts of + instructions used in this file, came from + https://developer.arm.com/documentation/ddi0602/2024-09/Index-by-Encoding + (Arm A-profile A64 Instruction Set Architecture) +*/ +#define IS_INSN(pc, name) ((*(pc) & name##_mask) == name##_id) +static const uint32_t add_id = 0x11000000; +static const uint32_t add_mask = 0x7fc00000; +static const uint32_t adrp_id = 0x90000000; +static const uint32_t adrp_mask = 0x9f000000; +static const uint32_t b_id = 0x14000000; +static const uint32_t b_mask = 0xfc000000; +static const uint32_t bl_id = 0x94000000; +static const uint32_t bl_mask = 0xfc000000; +/* matches both cbz and cbnz */ +static const uint32_t cbz_id = 0x34000000; +static const uint32_t cbz_mask = 0x7e000000; +static const uint32_t ldr_id = 0xb9400000; +static const uint32_t ldr_mask = 0xbfc00000; +/* matches both ret and br (which are the same except ret is a 'hint' that + it's a subroutine return */ +static const uint32_t ret_id = 0xd61f0000; +static const uint32_t ret_mask = 0xffbffc1f; + +/* this would work for either bl or b, but we only use it for bl */ +static inline LPCVOID +extract_bl_target (const uint32_t *pc) +{ + assert (IS_INSN (pc, bl) || IS_INSN (pc, b)); + int32_t offset = *pc & ~bl_mask; + /* sign extend */ + if (offset & (1 << 25)) + offset |= bl_mask; + /* Note uint32_t * artithmatic will implicitly multiply the offset by 4 */ + return pc + offset; +} + +static inline uint64_t +extract_adrp_address (const uint32_t *pc) +{ + assert (IS_INSN (pc, adrp)); + uint64_t adrp_base = (uint64_t) pc & ~0xFFF; + int64_t adrp_imm = (*pc >> (5+19+5)) & 0x3; + adrp_imm |= ((*pc >> 5) & 0x7FFFF) << 2; + /* sign extend */ + if (adrp_imm & (1 << 20)) + adrp_imm |= ~((1 << 21) - 1); + adrp_imm <<= 12; + return adrp_base + adrp_imm; +} + +/* This function scans the code in ntdll.dll to find the address of the + global variable used to access the CWD. While the pointer is global, + it's not exported from the DLL, unfortunately. Therefore we have to + use some knowledge to figure out the address. */ + +fcwd_access_t ** +find_fast_cwd_pointer_aarch64 () +{ + /* Fetch entry points of relevant functions in ntdll.dll. */ + HMODULE ntdll = GetModuleHandle ("ntdll.dll"); + if (!ntdll) + return NULL; + LPCVOID get_dir = GetArm64ProcAddress (ntdll, "RtlGetCurrentDirectory_U"); + LPCVOID ent_crit = GetArm64ProcAddress (ntdll, "RtlEnterCriticalSection"); + if (!get_dir || !ent_crit) + return NULL; + + LPCVOID use_cwd = NULL; + const uint32_t *start = (const uint32_t *) get_dir; + const uint32_t *pc = start; + /* find the call to RtlpReferenceCurrentDirectory, and get its address */ + for (; pc < start + 20 && !IS_INSN (pc, ret) && !IS_INSN (pc, b); pc++) + { + if (IS_INSN (pc, bl)) + { + use_cwd = extract_bl_target (pc); + break; + } + } + if (!use_cwd) + return NULL; + + start = pc = (const uint32_t *) use_cwd; + + const uint32_t *ldrpc = NULL; + uint32_t ldroffset, ldrsz; + uint32_t ldrrn, ldrrd; + + /* find the ldr (immediate unsigned offset) for RtlpCurDirRef */ + for (; pc < start + 20 && !IS_INSN (pc, ret) && !IS_INSN (pc, b); pc++) + { + if (IS_INSN (pc, ldr)) + { + ldrpc = pc; + ldrsz = (*pc & 0x40000000); + ldroffset = (*pc >> (5+5)) & 0xFFF; + ldroffset <<= ldrsz ? 3 : 2; + ldrrn = (*pc >> 5) & 0x1F; + ldrrd = *pc & 0x1F; + break; + } + } + if (ldrpc == NULL) + return NULL; + + /* the next instruction after the ldr should be checking if it was NULL: + either a compare and branch if zero or not zero (hence why cbz_mask is 7e + instead of 7f) */ + if (!IS_INSN (pc + 1, cbz) || (*(pc + 1) & 0x1F) != ldrrd + || (*(pc + 1) & 0x80000000) != (ldrsz << 1)) + return NULL; + + /* work backwards, find a bl to RtlEnterCriticalSection whose argument + is the fast peb lock */ + + for (pc = ldrpc; pc >= start; pc--) + { + if (IS_INSN (pc, bl) && extract_bl_target (pc) == ent_crit) + break; + } + uint32_t addoffset; + uint32_t addrn; + for (; pc >= start; pc--) + { + if (IS_INSN (pc, add) && (*pc & 0x1F) == 0) + { + addoffset = (*pc >> (5+5)) & 0xFFF; + addrn = (*pc >> 5) & 0x1F; + break; + } + } + PRTL_CRITICAL_SECTION lockaddr = NULL; + for (; pc >= start; pc--) + { + if (IS_INSN (pc, adrp) && (*pc & 0x1F) == addrn) + { + lockaddr = (PRTL_CRITICAL_SECTION) (extract_adrp_address (pc) + + addoffset); + break; + } + } + if (lockaddr != NtCurrentTeb ()->Peb->FastPebLock) + return NULL; + + /* work backwards from the ldr to find the corresponding adrp */ + fcwd_access_t **RtlpCurDirRef = NULL; + for (pc = ldrpc; pc >= start; pc--) + { + if (IS_INSN (pc, adrp) && (*pc & 0x1F) == ldrrn) + { + RtlpCurDirRef = (fcwd_access_t **) (extract_adrp_address (pc) + + ldroffset); + break; + } + } + + return RtlpCurDirRef; +} + diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc index 3a5e2ee..7a08e97 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc @@ -4495,21 +4495,36 @@ fcwd_access_t ** find_fast_cwd_pointer_x86_64 (); #endif +fcwd_access_t ** +find_fast_cwd_pointer_aarch64 (); + static fcwd_access_t ** find_fast_cwd () { fcwd_access_t **f_cwd_ptr; - /* First check if we're running on an ARM64 system. Skip - fetching FAST_CWD pointer as long as there's no solution for finding - it on that system. */ - if (wincap.host_machine () == IMAGE_FILE_MACHINE_ARM64) - return NULL; + switch (wincap.host_machine ()) + { + case IMAGE_FILE_MACHINE_ARM64: + f_cwd_ptr = find_fast_cwd_pointer_aarch64 (); + break; +#ifdef __x86_64__ + case IMAGE_FILE_MACHINE_AMD64: + f_cwd_ptr = find_fast_cwd_pointer_x86_64 (); + break; +#endif + default: + small_printf ("Cygwin WARNING:\n" +" Couldn't compute FAST_CWD pointer for an unknown architecture (%04y)\n" +" Please update to the latest available Cygwin version from\n" +" https://cygwin.com/. If the problem persists, please see\n" +" https://cygwin.com/problems.html\n\n", (int) wincap.host_machine ()); + return NULL; + } /* Fetch the pointer but don't set the global fast_cwd_ptr yet. First we have to make sure we know the version of the FAST_CWD structure used on the system. */ - f_cwd_ptr = find_fast_cwd_pointer_x86_64 (); if (!f_cwd_ptr) small_printf ("Cygwin WARNING:\n" " Couldn't compute FAST_CWD pointer. This typically occurs if you're using\n" diff --git a/winsup/testsuite/winsup.api/ltp/sbrk01.c b/winsup/testsuite/winsup.api/ltp/sbrk01.c index 700fb6b..ed30338 100644 --- a/winsup/testsuite/winsup.api/ltp/sbrk01.c +++ b/winsup/testsuite/winsup.api/ltp/sbrk01.c @@ -140,7 +140,7 @@ main(int ac, char **av) ***************************************************************/ if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL ) { tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - tst_exit(0); + tst_exit(); } /*************************************************************** diff --git a/winsup/testsuite/winsup.api/ltp/symlink01.c b/winsup/testsuite/winsup.api/ltp/symlink01.c index 186a85b..a1441c6 100644 --- a/winsup/testsuite/winsup.api/ltp/symlink01.c +++ b/winsup/testsuite/winsup.api/ltp/symlink01.c @@ -288,26 +288,27 @@ #include "test.h" #include "usctest.h" +struct all_test_cases; void setup(); void cleanup(void) __attribute__((noreturn)); void help(); -void delete_files(); -void do_EEXIST(); -void do_ENOENT(); -void do_ELOOP(); -void do_ENOTDIR(); -void do_EXDEV(); -void do_ENAMETOOLONG(); -void do_EINVAL(); -void do_readlink(); -void do_stat(); -void do_chdir(); -void do_link(); -void do_unlink(); -void do_chmod(); -void do_utime(); -void do_rename(); -void do_open(); +void delete_files(char *path1, char *path2); +void do_EEXIST(struct all_test_cases *tc_ptr); +void do_ENOENT(struct all_test_cases *tc_ptr); +void do_ELOOP(struct all_test_cases *tc_ptr); +void do_ENOTDIR(struct all_test_cases *tc_ptr); +void do_EXDEV(struct all_test_cases *tc_ptr); +void do_ENAMETOOLONG(struct all_test_cases *tc_ptr); +void do_EINVAL(struct all_test_cases *tc_ptr); +void do_readlink(struct all_test_cases *tc_ptr); +void do_stat(struct all_test_cases *tc_ptr); +void do_chdir(struct all_test_cases *tc_ptr); +void do_link(struct all_test_cases *tc_ptr); +void do_unlink(struct all_test_cases *tc_ptr); +void do_chmod(struct all_test_cases *tc_ptr); +void do_utime(struct all_test_cases *tc_ptr); +void do_rename(struct all_test_cases *tc_ptr); +void do_open(struct all_test_cases *tc_ptr); #define S_FILE "symbolic" /* Name of symbolic link file */ #define O_FILE "object" /* Name of object file */ @@ -378,8 +379,14 @@ const char *msgs[] = { /* * Define test object setup and validation functions */ -int creat_both(), creat_symlink(), creat_path_max(), ck_symlink(), - creat_object(), ck_object(), ck_both(), ck_path_max(); +int creat_both(const char *path1, const char *path2, const char *path3); +int creat_symlink(const char *path1, const char *path2, const char *unused); +int creat_path_max(const char *path1, const char *path2, const char *path3); +int creat_object(const char *path1, const char *unused1, const char *unused2); +int ck_symlink(const char *path1, const char *path2, const char *path3); +int ck_object(const char *path1, const char *path2, const char *path3); +int ck_both(const char *path1, const char *path2, const char *path3); +int ck_path_max(const char *path1, const char *path2, const char *path3); /* @@ -391,10 +398,10 @@ struct all_test_cases int test_fail; int errno_val; int pass_msg; - int (*test_setup)(); - int (*ck_test)(); + int (*test_setup)(const char *, const char *, const char *); + int (*ck_test)(const char *, const char *, const char *); const char *fn_arg[3]; - + } test_objects[] = { {SYMLINK, 0, 0, 0, creat_symlink, ck_symlink, {"%bc+eFhi!k", S_FILE, NULL}}, {SYMLINK, 0, 0, 0, creat_symlink, ck_symlink, {O_FILE, S_FILE, NULL}}, @@ -491,7 +498,6 @@ char test_msg[BUFMAX]; char full_path[PATH_MAX+1+1]; /* Add one for '\0' and another to exceed the PATH_MAX limit, see creat_path_max() */ extern int Tst_count; extern char *TESTDIR; -extern char *strrchr(); extern int errno; struct stat asymlink, statter; @@ -511,8 +517,8 @@ option_t Options[] = { int main(int argc, char *argv[]) { - struct tcses *tcs_ptr, *get_tcs_info(); - int do_syscalltests(); + struct tcses *tcs_ptr, *get_tcs_info(char *ptr); + int do_syscalltests(struct tcses *tcs); void cleanup(); int lc; /* loop counter */ const char *msg; /* message returned from parse_opts */ @@ -589,8 +595,7 @@ main(int argc, char *argv[]) * * Argument is path to program name. ***********************************************************************/ -struct tcses *get_tcs_info(ptr) -char *ptr; +struct tcses *get_tcs_info(char *ptr) { unsigned ctr; struct tcses *tcs_ptr; @@ -605,16 +610,14 @@ char *ptr; } #endif - for(ctr=0; ctr < (sizeof(all_tcses)/sizeof(struct tcses)); ctr++) { - if ( strcmp(ptr, all_tcses[ctr].tcid) == 0 || + if ( strcmp(ptr, all_tcses[ctr].tcid) == 0 || strcmp(ptr, all_tcses[ctr].syscall) == 0 ) { tcs_ptr = &all_tcses[ctr]; TCID = all_tcses[ctr].tcid; TST_TOTAL=tcs_ptr->test_cases; return(tcs_ptr); } - } return(NULL); } @@ -628,8 +631,7 @@ char *ptr; * link file and a minus one if the path doesn't point at a file. ***********************************************************************/ int -see_if_a_symlink(path) -char *path; +see_if_a_symlink(const char *path) { if (lstat(path, &asymlink) < 0) return(-1); @@ -644,8 +646,7 @@ char *path; * This function performs without any hesitation, file(s) deletions ***********************************************************************/ void -delete_files(path1, path2) -char *path1, *path2; +delete_files(char *path1, char *path2) { unlink(path1); unlink(path2); @@ -660,8 +661,7 @@ char *path1, *path2; * ***********************************************************************/ int -creat_symlink(path1, path2) -char *path1, *path2; +creat_symlink(const char *path1, const char *path2, const char *unused) { TEST( symlink(path1, path2) ); errno=TEST_ERRNO; @@ -671,7 +671,7 @@ char *path1, *path2; "symlink(2) Failure when creating setup %s object file: errno:%d %s", path1, errno, strerror(errno)); return(0); - } + } else { sprintf(Buf, "symlink(%s, %s) was succesful.\n", path1, path2); strcat(Buffer, Buf); @@ -690,8 +690,7 @@ char *path1, *path2; * ***********************************************************************/ int -creat_object(path1) -char *path1; +creat_object(const char *path1, const char *unused1, const char *unused2) { int fd; if ((fd=creat(path1, MODE)) == -1) { @@ -700,7 +699,7 @@ char *path1; "creat(2) Failure when creating setup %s object file: errno:%d %s", path1, errno, strerror(errno)); return(0); - } + } else { sprintf(Buf, "creat(%s, %#o) was succesful.\n", path1, MODE); strcat(Buffer, Buf); @@ -728,12 +727,11 @@ char *path1; * ***********************************************************************/ int -creat_both(path1, path2, path3) -char *path1, *path2, *path3; +creat_both(const char *path1, const char *path2, const char *path3) { - if (creat_symlink(path1, path2) == -1) + if (creat_symlink(path1, path2, NULL) == -1) return(0); - else if (creat_object(path3) == -1) + else if (creat_object(path3, NULL, NULL) == -1) return(0); return(1); } @@ -748,8 +746,7 @@ char *path1, *path2, *path3; * ***********************************************************************/ int -ck_symlink(path1, path2, path3) -char *path1, *path2, *path3; +ck_symlink(const char *path1, const char *path2, const char *path3) { int ret; @@ -780,8 +777,7 @@ char *path1, *path2, *path3; * ***********************************************************************/ int -ck_both(path1, path2, path3) -char *path1, *path2, *path3; +ck_both(const char *path1, const char *path2, const char *path3) { if (ck_symlink(path1, path2, path3) == 0) return(0); @@ -804,7 +800,6 @@ char *path1, *path2, *path3; return(0); } return(1); - } /*********************************************************************** @@ -816,8 +811,7 @@ char *path1, *path2, *path3; * Argument three is regular file name ***********************************************************************/ int -creat_path_max(path1, path2, path3) -char *path1, *path2, *path3; +creat_path_max(const char *path1, const char *path2, const char *path3) { int ctr, to_go, size, whole_chunks; char buf [PATH_MAX]; @@ -858,8 +852,7 @@ char *path1, *path2, *path3; * Argument three is regular file name ***********************************************************************/ int -ck_path_max(path1, path2, path3) -char *path1, *path2, *path3; +ck_path_max(const char *path1, const char *path2, const char *path3) { if (strlen(full_path) == (PATH_MAX+1)) return(1); @@ -884,8 +877,7 @@ char *path1, *path2, *path3; * ***********************************************************************/ int -ck_object(path1, path2, path3) -char *path1, *path2, *path3; +ck_object(const char *path1, const char *path2, const char *path3) { int ret; @@ -897,7 +889,7 @@ char *path1, *path2, *path3; } else if (ret == 1) { TEST_RESULT=TFAIL; - sprintf(test_msg, + sprintf(test_msg, "lstat(2) detected a regular object file as a symbolic link file"); return(0); } @@ -912,7 +904,6 @@ char *path1, *path2, *path3; sprintf(test_msg, "lstat(2) and stat(2) do not return same inode information for an object file"); return(0); - } return(1); } @@ -923,8 +914,7 @@ char *path1, *path2, *path3; * Argument is a ptr into the all_tcses array of structures of type tcses ***********************************************************************/ int -do_syscalltests(tcs) -struct tcses *tcs; +do_syscalltests(struct tcses *tcs) { int ctr, ret; struct all_test_cases *tc_ptr; @@ -957,20 +947,20 @@ struct tcses *tcs; } TEST_RESULT=TPASS; delete_files(S_FILE, O_FILE); - /* + /* * Perform test case setup */ ret = (tc_ptr->test_setup)(tc_ptr->fn_arg[0], tc_ptr->fn_arg[1], - tc_ptr->fn_arg[2], tc_ptr->errno_val); + tc_ptr->fn_arg[2]); /* If an expected error, try it out */ if (tc_ptr->test_fail) { - /* + /* * Try to perform test verification function */ if (! (tc_ptr->ck_test)(tc_ptr->fn_arg[0], tc_ptr->fn_arg[1], - tc_ptr->fn_arg[2], tc_ptr->errno_val)) + tc_ptr->fn_arg[2])) tst_resm(TEST_RESULT, test_msg); else if (tc_ptr->errno_val == EEXIST) do_EEXIST(tc_ptr); @@ -990,22 +980,22 @@ struct tcses *tcs; tst_resm(TBROK, "Test Case Declaration Error"); } else if (ret == 1) { /* No setup function error */ - + if (tc_ptr->errno_val != 0) tst_resm(TBROK, "Test Case Declaration Error"); else { - /* + /* * Perform test verification function */ ret=(tc_ptr->ck_test)(tc_ptr->fn_arg[0], tc_ptr->fn_arg[1], - tc_ptr->fn_arg[2], tc_ptr->errno_val); + tc_ptr->fn_arg[2]); /* Perform requested symbolic link system call test */ if ((cktcsid(tc_ptr->tcid, SYMLINK)) || (cktcsid(tc_ptr->tcid, LSTAT))) { if (ret == 1) - tst_resm(TEST_RESULT, msgs[tc_ptr->pass_msg]); + tst_resm(TEST_RESULT, msgs[tc_ptr->pass_msg]); else tst_resm(TEST_RESULT, test_msg); } @@ -1047,8 +1037,7 @@ struct tcses *tcs; * all_test_cases ***********************************************************************/ void -do_EEXIST(tc_ptr) -struct all_test_cases *tc_ptr; +do_EEXIST(struct all_test_cases *tc_ptr) { if (cktcsid(tc_ptr->tcid, SYMLINK)) { @@ -1109,8 +1098,7 @@ struct all_test_cases *tc_ptr; * all_test_cases ***********************************************************************/ void -do_ENOENT(tc_ptr) -struct all_test_cases *tc_ptr; +do_ENOENT(struct all_test_cases *tc_ptr) { if (cktcsid(tc_ptr->tcid, STAT)) { @@ -1204,8 +1192,7 @@ struct all_test_cases *tc_ptr; * all_test_cases ***********************************************************************/ void -do_ELOOP(tc_ptr) -struct all_test_cases *tc_ptr; +do_ELOOP(struct all_test_cases *tc_ptr) { if (cktcsid(tc_ptr->tcid, STAT)) { @@ -1314,8 +1301,7 @@ struct all_test_cases *tc_ptr; * all_test_cases ***********************************************************************/ void -do_ENOTDIR(tc_ptr) -struct all_test_cases *tc_ptr; +do_ENOTDIR(struct all_test_cases *tc_ptr) { if (cktcsid(tc_ptr->tcid, RMDIR)) { @@ -1350,8 +1336,7 @@ struct all_test_cases *tc_ptr; * all_test_cases ***********************************************************************/ void -do_EXDEV(tc_ptr) -struct all_test_cases *tc_ptr; +do_EXDEV(struct all_test_cases *tc_ptr) { if (cktcsid(tc_ptr->tcid, RENAME)) { @@ -1388,8 +1373,7 @@ struct all_test_cases *tc_ptr; * all_test_cases ***********************************************************************/ void -do_ENAMETOOLONG(tc_ptr) -struct all_test_cases *tc_ptr; +do_ENAMETOOLONG(struct all_test_cases *tc_ptr) { int ret; @@ -1440,8 +1424,7 @@ struct all_test_cases *tc_ptr; * all_test_cases ***********************************************************************/ void -do_EINVAL(tc_ptr) -struct all_test_cases *tc_ptr; +do_EINVAL(struct all_test_cases *tc_ptr) { if (cktcsid(tc_ptr->tcid, READLINK)) { TEST( readlink(tc_ptr->fn_arg[0], test_msg, BUFMAX) ); @@ -1473,8 +1456,7 @@ struct all_test_cases *tc_ptr; * all_test_cases ***********************************************************************/ void -do_readlink(tc_ptr) -struct all_test_cases *tc_ptr; +do_readlink(struct all_test_cases *tc_ptr) { char scratch[PATH_MAX]; int ret; @@ -1514,8 +1496,7 @@ struct all_test_cases *tc_ptr; * all_test_cases ***********************************************************************/ void -do_stat(tc_ptr) -struct all_test_cases *tc_ptr; +do_stat(struct all_test_cases *tc_ptr) { if (statter.st_dev != asymlink.st_dev) tst_resm(TFAIL, @@ -1575,8 +1556,7 @@ struct all_test_cases *tc_ptr; * all_test_cases ***********************************************************************/ void -do_chdir(tc_ptr) -struct all_test_cases *tc_ptr; +do_chdir(struct all_test_cases *tc_ptr) { if (mkdir(tc_ptr->fn_arg[2],MODE) == -1) tst_resm(TFAIL, "Could not create a setup directory file"); @@ -1626,8 +1606,7 @@ struct all_test_cases *tc_ptr; * all_test_cases ***********************************************************************/ void -do_link(tc_ptr) -struct all_test_cases *tc_ptr; +do_link(struct all_test_cases *tc_ptr) { struct stat stbuf; @@ -1688,8 +1667,7 @@ struct all_test_cases *tc_ptr; * all_test_cases ***********************************************************************/ void -do_unlink(tc_ptr) -struct all_test_cases *tc_ptr; +do_unlink(struct all_test_cases *tc_ptr) { if (stat(tc_ptr->fn_arg[2], &asymlink) == -1) tst_resm(TBROK, @@ -1730,8 +1708,7 @@ struct all_test_cases *tc_ptr; * all_test_cases ***********************************************************************/ void -do_chmod(tc_ptr) -struct all_test_cases *tc_ptr; +do_chmod(struct all_test_cases *tc_ptr) { if (stat(tc_ptr->fn_arg[2], &asymlink) == -1) tst_resm(TBROK, @@ -1772,8 +1749,7 @@ struct all_test_cases *tc_ptr; * all_test_cases ***********************************************************************/ void -do_utime(tc_ptr) -struct all_test_cases *tc_ptr; +do_utime(struct all_test_cases *tc_ptr) { struct utimbuf utimes; @@ -1828,8 +1804,7 @@ struct all_test_cases *tc_ptr; * all_test_cases ***********************************************************************/ void -do_rename(tc_ptr) -struct all_test_cases *tc_ptr; +do_rename(struct all_test_cases *tc_ptr) { int pts_at_object = 0; @@ -1870,8 +1845,7 @@ struct all_test_cases *tc_ptr; * all_test_cases ***********************************************************************/ void -do_open(tc_ptr) -struct all_test_cases *tc_ptr; +do_open(struct all_test_cases *tc_ptr) { int fd = -1; int ret, pts_at_object = 0; |