From c66452515d7b4ebf6b0633735397db9a392a839e Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 28 Nov 1996 04:16:09 +0000 Subject: update from main archive 961127 Thu Nov 28 03:11:11 1996 Ulrich Drepper * libio/fileops.c: Update from latest libg++. * sysdeps/unix/sysv/linux/init-first.c: Reformat copyright. * sysdeps/stub/libc-lock.h: Add __libc_lock_init_recursive. * libio/genops.c (_IO_init): Use __libc_lock_init_recursive instead of __libc_lock_init for streams. Reported by a sun . * sysdepsunix/sysv/linux/i386/brk.c: Reformat copyright. * sysdeps/generic/errno-loc.c: New file. Generic definition of __errno_location function. * sysdeps/unix/sysv/linux/i386/sysdep.S: Remove definition of __errno_location. * sysdeps/unix/sysv/linux/m68k/sysdep.S: Likewise. * sysdeps/unix/sysv/linux/Makefile [$(subdir)=csu]: Add errno-loc to sysdep-routines. * sysdeps/unix/sysv/linux/configure: Add test for linuxthreads and crypt add-on and warn if not available. Wed Nov 27 23:09:37 1996 Ulrich Drepper * po/ko.po: Update from Bang Jun-Young . * sysdeps/unix/sysv/linux/syscalls.list: Remove _llseek. * sysdeps/unix/sysv/linux/Makefile [$(subdir)=misc] (routines): Add llseek. * sysdeps/unix/sysv/linux/llseek.c: New file. Uses syscall. * sysdeps/unix/sysv/linux/i386/syscalls.list: Add __sys_llseek. * sysdeps/unix/sysv/linux/m68k/syscalls.list: Add __sys_llseek. Reported by HJ Lu . * sysdeps/unix/sysv/linux/alpha/syscalls.list: Add llseek. * sysdeps/unix/sysv/linux/alpha/llseek.S: Remove. Generic syscall is enough. Patch by Richard Henderson . * sysdeps/unix/sysv/linux/alpha/sys/io.h: Add prototypes for pciconfig_read and pciconfig_write. * sysdeps/unix/sysv/linux/alpha/syscalls.list: Add new syscalls pciconfig_read and pciconfig_write. * login/getutent_r.c: Fix several bugs in last change. --- ChangeLog | 57 ++- configure | 139 +++--- libio/fileops.c | 10 +- libio/genops.c | 2 +- po/ko.po | 654 ++++++++++++++-------------- sysdeps/alpha/elf/Makefile | 4 + sysdeps/generic/errno-loc.c | 28 ++ sysdeps/stub/libc-lock.h | 3 + sysdeps/unix/sysv/linux/Makefile | 4 +- sysdeps/unix/sysv/linux/alpha/sys/io.h | 13 + sysdeps/unix/sysv/linux/alpha/syscalls.list | 5 + sysdeps/unix/sysv/linux/configure | 22 + sysdeps/unix/sysv/linux/i386/brk.c | 34 +- sysdeps/unix/sysv/linux/i386/syscalls.list | 1 + sysdeps/unix/sysv/linux/i386/sysdep.S | 17 - sysdeps/unix/sysv/linux/init-first.c | 34 +- sysdeps/unix/sysv/linux/llseek.c | 35 ++ sysdeps/unix/sysv/linux/m68k/sysdep.S | 13 - sysdeps/unix/sysv/linux/syscalls.list | 1 - 19 files changed, 607 insertions(+), 469 deletions(-) create mode 100644 sysdeps/alpha/elf/Makefile create mode 100644 sysdeps/generic/errno-loc.c create mode 100644 sysdeps/unix/sysv/linux/llseek.c diff --git a/ChangeLog b/ChangeLog index d7fed11e61..cac800e9df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,50 @@ +Thu Nov 28 03:11:11 1996 Ulrich Drepper + + * libio/fileops.c: Update from latest libg++. + + * sysdeps/unix/sysv/linux/init-first.c: Reformat copyright. + + * sysdeps/stub/libc-lock.h: Add __libc_lock_init_recursive. + * libio/genops.c (_IO_init): Use __libc_lock_init_recursive + instead of __libc_lock_init for streams. + Reported by a sun . + + * sysdepsunix/sysv/linux/i386/brk.c: Reformat copyright. + + * sysdeps/generic/errno-loc.c: New file. Generic definition of + __errno_location function. + * sysdeps/unix/sysv/linux/i386/sysdep.S: Remove definition of + __errno_location. + * sysdeps/unix/sysv/linux/m68k/sysdep.S: Likewise. + * sysdeps/unix/sysv/linux/Makefile [$(subdir)=csu]: Add errno-loc + to sysdep-routines. + + * sysdeps/unix/sysv/linux/configure: Add test for linuxthreads + and crypt add-on and warn if not available. + +Wed Nov 27 23:09:37 1996 Ulrich Drepper + + * po/ko.po: Update from Bang Jun-Young . + + * sysdeps/unix/sysv/linux/syscalls.list: Remove _llseek. + * sysdeps/unix/sysv/linux/Makefile [$(subdir)=misc] (routines): Add + llseek. + * sysdeps/unix/sysv/linux/llseek.c: New file. Uses syscall. + * sysdeps/unix/sysv/linux/i386/syscalls.list: Add __sys_llseek. + * sysdeps/unix/sysv/linux/m68k/syscalls.list: Add __sys_llseek. + Reported by HJ Lu . + * sysdeps/unix/sysv/linux/alpha/syscalls.list: Add llseek. + * sysdeps/unix/sysv/linux/alpha/llseek.S: Remove. Generic syscall + is enough. + Patch by Richard Henderson . + + * sysdeps/unix/sysv/linux/alpha/sys/io.h: Add prototypes for + pciconfig_read and pciconfig_write. + * sysdeps/unix/sysv/linux/alpha/syscalls.list: Add new syscalls + pciconfig_read and pciconfig_write. + + * login/getutent_r.c: Fix several bugs in last change. + Wed Nov 27 06:10:10 1996 Ulrich Drepper * Makefile: Fix typo. @@ -59,16 +106,6 @@ Wed Nov 27 06:10:10 1996 Ulrich Drepper * stdlib/stdlib.h: Reformat. - * time/africa: Update from ADO tzdata1996m. - * time/antarctica: Likewise. - * time/asia: Likewise. - * time/australia: Likewise. - * time/etcetera: Likewise. - * time/europe: Likewise. - * time/northamerica: Likewise. - * time/southamerica: Likewise. - * time/zone.tab: Likewise. - Fri Nov 22 19:34:12 1996 Andreas Schwab * sysdeps/posix/getcwd.c (__getcwd): After resizing the buffer diff --git a/configure b/configure index b2586e2f57..4d2a9680a6 100755 --- a/configure +++ b/configure @@ -2,7 +2,7 @@ # From configure.in CVSid # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.11 +# Generated automatically using autoconf version 2.12 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -357,7 +357,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.11" + echo "configure generated by autoconf version 2.12" exit 0 ;; -with-* | --with-*) @@ -459,11 +459,14 @@ do done # NLS nuisances. -# Only set LANG and LC_ALL to C if already set. -# These must not be set unconditionally because not all systems understand -# e.g. LANG=C (notably SCO). -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +# Only set these to C if already set. These must not be set unconditionally +# because not all systems understand e.g. LANG=C (notably SCO). +# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! +# Non-C LC_CTYPE values break the ctype check. if test "${LANG+set}" = set; then LANG=C; export LANG; fi +if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi +if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -rf conftest* confdefs.h @@ -525,6 +528,7 @@ ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. @@ -704,7 +708,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:708: checking host system type" >&5 +echo "configure:712: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -784,7 +788,7 @@ esac # This can take a while to compute. sysdep_dir=$srcdir/sysdeps echo $ac_n "checking sysdep dirs""... $ac_c" 1>&6 -echo "configure:788: checking sysdep dirs" >&5 +echo "configure:792: checking sysdep dirs" >&5 # Make sco3.2v4 become sco3.2.4 and sunos4.1.1_U1 become sunos4.1.1.U1. os="`echo $os | sed 's/\([0-9A-Z]\)[v_]\([0-9A-Z]\)/\1.\2/g'`" @@ -985,12 +989,12 @@ echo "$ac_t""sysdeps/generic sysdeps/stub" 1>&6 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:989: checking for a BSD compatible install" >&5 +echo "configure:993: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in @@ -1013,7 +1017,7 @@ else ;; esac done - IFS="$ac_save_ifs" + IFS="$ac_save_IFS" fi if test "${ac_cv_path_install+set}" = set; then @@ -1039,7 +1043,7 @@ if test "$INSTALL" = "${srcdir}/install-sh -c"; then INSTALL='$(..)./install-sh -c' fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1043: checking whether ln -s works" >&5 +echo "configure:1047: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1064,7 +1068,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1068: checking for $ac_word" >&5 +echo "configure:1072: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1095,7 +1099,7 @@ test -n "$MSGFMT" || MSGFMT=":" echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1099: checking build system type" >&5 +echo "configure:1103: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1121,7 +1125,7 @@ fi # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1125: checking for $ac_word" >&5 +echo "configure:1129: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1153,7 +1157,7 @@ if test $host != $build; then # Extract the first word of "gcc cc", so it can be a program name with args. set dummy gcc cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1157: checking for $ac_word" >&5 +echo "configure:1161: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_BUILD_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1180,7 +1184,7 @@ fi fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1184: checking how to run the C preprocessor" >&5 +echo "configure:1188: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1195,13 +1199,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1209: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1212,13 +1216,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1222: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1226: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1243,7 +1247,7 @@ echo "$ac_t""$CPP" 1>&6 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1247: checking for $ac_word" >&5 +echo "configure:1251: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1274,7 +1278,7 @@ fi # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1278: checking for $ac_word" >&5 +echo "configure:1282: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1305,7 +1309,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1309: checking for $ac_word" >&5 +echo "configure:1313: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1340,7 +1344,7 @@ fi # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1344: checking for $ac_word" >&5 +echo "configure:1348: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_BASH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1377,7 +1381,7 @@ fi echo $ac_n "checking for signed size_t type""... $ac_c" 1>&6 -echo "configure:1381: checking for signed size_t type" >&5 +echo "configure:1385: checking for signed size_t type" >&5 if eval "test \"`echo '$''{'libc_cv_signed_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1401,12 +1405,12 @@ EOF fi echo $ac_n "checking for libc-friendly stddef.h""... $ac_c" 1>&6 -echo "configure:1405: checking for libc-friendly stddef.h" >&5 +echo "configure:1409: checking for libc-friendly stddef.h" >&5 if eval "test \"`echo '$''{'libc_cv_friendly_stddef'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* libc_cv_friendly_stddef=yes else @@ -1431,7 +1435,6 @@ else libc_cv_friendly_stddef=no fi rm -f conftest* - fi echo "$ac_t""$libc_cv_friendly_stddef" 1>&6 @@ -1441,7 +1444,7 @@ override stddef.h = # The installed seems to be libc-friendly." fi echo $ac_n "checking whether we need to use -P to assemble .S files""... $ac_c" 1>&6 -echo "configure:1445: checking whether we need to use -P to assemble .S files" >&5 +echo "configure:1448: checking whether we need to use -P to assemble .S files" >&5 if eval "test \"`echo '$''{'libc_cv_need_minus_P'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1464,7 +1467,7 @@ asm-CPPFLAGS = -P # The assembler can't grok cpp's # line directives." fi echo $ac_n "checking for assembler global-symbol directive""... $ac_c" 1>&6 -echo "configure:1468: checking for assembler global-symbol directive" >&5 +echo "configure:1471: checking for assembler global-symbol directive" >&5 if eval "test \"`echo '$''{'libc_cv_asm_global_directive'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1494,7 +1497,7 @@ EOF fi echo $ac_n "checking for .set assembler directive""... $ac_c" 1>&6 -echo "configure:1498: checking for .set assembler directive" >&5 +echo "configure:1501: checking for .set assembler directive" >&5 if eval "test \"`echo '$''{'libc_cv_asm_set_directive'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1529,12 +1532,12 @@ fi if test $elf != yes; then echo $ac_n "checking for .init and .fini sections""... $ac_c" 1>&6 -echo "configure:1533: checking for .init and .fini sections" >&5 +echo "configure:1536: checking for .init and .fini sections" >&5 if eval "test \"`echo '$''{'libc_cv_have_initfini'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1550: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* libc_cv_have_initfini=yes else @@ -1553,7 +1556,6 @@ else libc_cv_have_initfini=no fi rm -f conftest* - fi echo "$ac_t""$libc_cv_have_initfini" 1>&6 @@ -1569,19 +1571,19 @@ if test $elf = yes; then libc_cv_asm_underscores=no else echo $ac_n "checking for _ prefix on C symbol names""... $ac_c" 1>&6 -echo "configure:1573: checking for _ prefix on C symbol names" >&5 +echo "configure:1575: checking for _ prefix on C symbol names" >&5 if eval "test \"`echo '$''{'libc_cv_asm_underscores'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* libc_cv_asm_underscores=yes else @@ -1591,7 +1593,6 @@ else libc_cv_asm_underscores=no fi rm -f conftest* - fi echo "$ac_t""$libc_cv_asm_underscores" 1>&6 @@ -1609,7 +1610,7 @@ if test $elf = yes; then libc_cv_asm_weakext_directive=no else echo $ac_n "checking for assembler .weak directive""... $ac_c" 1>&6 -echo "configure:1613: checking for assembler .weak directive" >&5 +echo "configure:1614: checking for assembler .weak directive" >&5 if eval "test \"`echo '$''{'libc_cv_asm_weak_directive'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1632,7 +1633,7 @@ echo "$ac_t""$libc_cv_asm_weak_directive" 1>&6 if test $libc_cv_asm_weak_directive = no; then echo $ac_n "checking for assembler .weakext directive""... $ac_c" 1>&6 -echo "configure:1636: checking for assembler .weakext directive" >&5 +echo "configure:1637: checking for assembler .weakext directive" >&5 if eval "test \"`echo '$''{'libc_cv_asm_weakext_directive'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1669,7 +1670,7 @@ EOF fi echo $ac_n "checking for ld --no-whole-archive""... $ac_c" 1>&6 -echo "configure:1673: checking for ld --no-whole-archive" >&5 +echo "configure:1674: checking for ld --no-whole-archive" >&5 if eval "test \"`echo '$''{'libc_cv_ld_no_whole_archive'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1680,7 +1681,7 @@ __throw () {} EOF if { ac_try='${CC-cc} $CFLAGS -nostdlib -nostartfiles -Wl,--no-whole-archive - -o conftest conftest.c'; { (eval echo configure:1684: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + -o conftest conftest.c'; { (eval echo configure:1685: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then libc_cv_ld_no_whole_archive=yes else libc_cv_ld_no_whole_archive=no @@ -1691,7 +1692,7 @@ fi echo "$ac_t""$libc_cv_ld_no_whole_archive" 1>&6 echo $ac_n "checking for gcc -fno-exceptions""... $ac_c" 1>&6 -echo "configure:1695: checking for gcc -fno-exceptions" >&5 +echo "configure:1696: checking for gcc -fno-exceptions" >&5 if eval "test \"`echo '$''{'libc_cv_gcc_no_exceptions'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1702,7 +1703,7 @@ __throw () {} EOF if { ac_try='${CC-cc} $CFLAGS -nostdlib -nostartfiles -fno-exceptions - -o conftest conftest.c'; { (eval echo configure:1706: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + -o conftest conftest.c'; { (eval echo configure:1707: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then libc_cv_gcc_no_exceptions=yes else libc_cv_gcc_no_exceptions=no @@ -1754,7 +1755,7 @@ if test "$uname" = generic; then fi echo $ac_n "checking OS release for uname""... $ac_c" 1>&6 -echo "configure:1758: checking OS release for uname" >&5 +echo "configure:1759: checking OS release for uname" >&5 if eval "test \"`echo '$''{'libc_cv_uname_release'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1776,7 +1777,7 @@ echo "$ac_t""$libc_cv_uname_release" 1>&6 uname_release="$libc_cv_uname_release" echo $ac_n "checking OS version for uname""... $ac_c" 1>&6 -echo "configure:1780: checking OS version for uname" >&5 +echo "configure:1781: checking OS version for uname" >&5 if eval "test \"`echo '$''{'libc_cv_uname_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1798,7 +1799,7 @@ else fi echo $ac_n "checking stdio selection""... $ac_c" 1>&6 -echo "configure:1802: checking stdio selection" >&5 +echo "configure:1803: checking stdio selection" >&5 case $stdio in libio) cat >> confdefs.h <<\EOF @@ -1866,12 +1867,25 @@ cat > confcache <<\EOF # --recheck option to rerun configure. # EOF +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, don't put newlines in cache variables' values. # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. -# HP-UX 10.01 sh prints single quotes around any value that contains spaces. (set) 2>&1 | -sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)='*\([^']*\)'*/\1=\${\1='\2'}/p"\ - >> confcache + case `(ac_space=' '; set) 2>&1` in + *ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote substitution + # turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + -e "s/'/'\\\\''/g" \ + -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" + ;; + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' + ;; + esac >> confcache if cmp -s $cache_file confcache; then : else @@ -1926,7 +1940,7 @@ do echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.11" + echo "$CONFIG_STATUS generated by autoconf version 2.12" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -2052,9 +2066,9 @@ CONFIG_FILES=\${CONFIG_FILES-"config.make ${config_makefile} ${config_uname}"} EOF cat >> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then - # Support "outfile[:infile]", defaulting infile="outfile.in". + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'` + *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; *) ac_file_in="${ac_file}.in" ;; esac @@ -2096,12 +2110,14 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then # $configure_input" ;; *) ac_comsub= ;; esac + + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` sed -e "$ac_comsub s%@configure_input@%$configure_input%g s%@srcdir@%$srcdir%g s%@top_srcdir@%$top_srcdir%g s%@INSTALL@%$INSTALL%g -" $ac_given_srcdir/$ac_file_in | eval "$ac_sed_cmds" > $ac_file +" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file fi; done rm -f conftest.s* @@ -2124,7 +2140,7 @@ ac_eB='$%\1#\2define\3' ac_eC=' ' ac_eD='%g' -if test -z "$CONFIG_HEADERS"; then +if test "${CONFIG_HEADERS+set}" != set; then EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF fi for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then - # Support "outfile[:infile]", defaulting infile="outfile.in". + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'` + *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; *) ac_file_in="${ac_file}.in" ;; esac @@ -2142,7 +2158,8 @@ for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then echo creating $ac_file rm -f conftest.frag conftest.in conftest.out - cp $ac_given_srcdir/$ac_file_in conftest.in + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + cat $ac_file_inputs > conftest.in EOF diff --git a/libio/fileops.c b/libio/fileops.c index b4bd5ce7cd..1851d9a1fa 100644 --- a/libio/fileops.c +++ b/libio/fileops.c @@ -308,7 +308,15 @@ DEFUN(_IO_file_overflow, (f, ch), _IO_doallocbuf(f); _IO_setg (f, f->_IO_buf_base, f->_IO_buf_base, f->_IO_buf_base); } - /* Otherwise must be currently reading. */ + /* Otherwise must be currently reading. + If _IO_read_ptr (and hence also _IO_read_end) is at the buffer end, + logically slide the buffer forwards one block (by setting the + read pointers to all point at the beginning of the block). This + makes room for subsequent output. + Otherwise, set the read pointers to _IO_read_end (leaving that + alone, so it can continue to correspond to the external position). */ + if (f->_IO_read_ptr == f->_IO_buf_end) + f->_IO_read_end = f->_IO_read_ptr = f->_IO_buf_base; f->_IO_write_ptr = f->_IO_read_ptr; f->_IO_write_base = f->_IO_write_ptr; f->_IO_write_end = f->_IO_buf_end; diff --git a/libio/genops.c b/libio/genops.c index bd741ec66e..fc4c61d9a4 100644 --- a/libio/genops.c +++ b/libio/genops.c @@ -466,7 +466,7 @@ DEFUN(_IO_init, (fp, flags), fp->_markers = NULL; fp->_cur_column = 0; #ifdef _IO_MTSAFE_IO - __libc_lock_init (*fp->_lock); + __libc_lock_init_recursive (*fp->_lock); #endif } diff --git a/po/ko.po b/po/ko.po index 726cb14b2e..ed257110b5 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,28 +1,18 @@ -# Korean messages for GNU libc +# GNU libc의 한국어 메시지 # Copyright (C) 1996 Free Software Foundation, Inc. # Bang Jun-Young , 1996. # msgid "" msgstr "" -"Project-Id-Version: GNU libc 1.94\n" -"POT-Creation-Date: 1996-09-08 3:45\n" -"PO-Revision-Date: 1996-09-26 12:34+0900\n" +"Project-Id-Version: GNU libc 1.96\n" +"POT-Creation-Date: 1996-10-17 03:22+0200\n" +"PO-Revision-Date: 1996-11-23 19:25+0900\n" "Last-Translator: Bang Jun-Young \n" "Language-Team: Korean \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=EUC-KR\n" "Content-Transfer-Encoding: 8-bit\n" -#: sunrpc/rpc_main.c:80 -#, c-format -msgid " %s [-c | -h | -l | -m] [-o outfile] [infile]\n" -msgstr " %s [-c | -h | -l | -m] [-o 출력파일] [입력파일]\n" - -#: sunrpc/rpc_main.c:83 -#, c-format -msgid " %s [-s udp|tcp]* [-o outfile] [infile]\n" -msgstr " %s [-s udp|tcp]* [-o 출력파일] [입력파일]\n" - #: sunrpc/rpcinfo.c:612 msgid " rpcinfo -b prognum versnum\n" msgstr " rpcinfo -b 프로그램번호 버전번호\n" @@ -43,34 +33,34 @@ msgstr " rpcinfo [ -n msgid " program vers proto port\n" msgstr " 프로그램 버전 원형 포트\n" -#: time/zic.c:425 +#: time/zic.c:424 #, c-format msgid " (rule from \"%s\", line %d)" msgstr " (\"%s\"에 있는 규칙, %d 행)" -#: locale/programs/ld-collate.c:360 locale/programs/ld-ctype.c:1233 +#: locale/programs/ld-collate.c:360 locale/programs/ld-ctype.c:1234 msgid " done\n" msgstr " 완료\n" -#: time/zic.c:422 -#, fuzzy, c-format +#: time/zic.c:421 +#, c-format msgid "\"%s\", line %d: %s" -msgstr "%s, 행 %d: " +msgstr "\"%s\", 행 %d: %s" -#: time/zic.c:946 +#: time/zic.c:945 #, c-format msgid "\"Zone %s\" line and -l option are mutually exclusive" msgstr "\"지역 %s\" 행과 -l 옵션은 서로 배타적입니다" -#: time/zic.c:954 +#: time/zic.c:953 #, c-format msgid "\"Zone %s\" line and -p option are mutually exclusive" msgstr "\"지역 %s\" 행과 -p 옵션은 서로 배타적입니다" -#: time/zic.c:759 +#: time/zic.c:758 #, c-format msgid "%s in ruleless zone" -msgstr "" +msgstr "규칙없는 지역에 %s가 있음" #: assert/assert.c:48 #, c-format @@ -87,52 +77,47 @@ msgstr "%s%s%s:%u: %s%s msgid "%s%sUnknown signal %d\n" msgstr "%s%s알 수 없는 신호 %d\n" -#: sunrpc/rpc_util.c:258 -#, c-format -msgid "%s, line %d: " -msgstr "%s, %d 행: " - -#: time/zic.c:2140 +#: time/zic.c:2139 #, c-format msgid "%s: %d did not sign extend correctly\n" -msgstr "" +msgstr "%s: %d는 부호 확장이 제대로 되지 않았습니다\n" #: locale/programs/charmap.c:176 #, c-format msgid "%s: must be greater than \n" msgstr "%s: 는 보다 커야 합니다\n" -#: time/zic.c:1431 +#: time/zic.c:1430 #, c-format msgid "%s: Can't create %s: %s\n" msgstr "%s: %s를 만들 수 없습니다: %s\n" -#: time/zic.c:2119 +#: time/zic.c:2118 #, c-format msgid "%s: Can't create directory %s: %s\n" msgstr "%s: %s 디렉토리를 만들 수 없습니다: %s\n" -#: time/zic.c:613 +#: time/zic.c:612 #, c-format msgid "%s: Can't link from %s to %s: %s\n" msgstr "%s: %s를 %s로 연결할 수 없습니다: %s\n" -#: time/zic.c:784 +#: time/zic.c:783 #, c-format msgid "%s: Can't open %s: %s\n" msgstr "%s: %s를 열 수 없습니다: %s\n" -#: time/zic.c:852 +#: time/zic.c:851 #, c-format msgid "%s: Error closing %s: %s\n" msgstr "%s: %s를 닫는 도중 오류 발생: %s\n" -#: time/zic.c:846 +#: time/zic.c:845 #, c-format msgid "%s: Error reading %s\n" msgstr "%s: %s를 읽는 도중 오류 발생\n" -#: time/zic.c:1495 +#: time/zic.c:1494 #, c-format msgid "%s: Error writing %s\n" msgstr "%s: %s를 쓰는 도중 오류 발생\n" @@ -142,7 +127,7 @@ msgstr "%s: %s msgid "%s: Error writing standard output " msgstr "%s: 표준 출력에 쓰는 도중 오류 발생 " -#: time/zic.c:831 +#: time/zic.c:830 #, c-format msgid "%s: Leap line in non leap seconds file %s\n" msgstr "" @@ -152,32 +137,32 @@ msgstr "" msgid "%s: Memory exhausted: %s\n" msgstr "%s: 메모리가 바닥남: %s\n" -#: time/zic.c:528 +#: time/zic.c:527 #, c-format msgid "%s: More than one -L option specified\n" msgstr "%s: 하나 이상의 -L 옵션이 지정되었음\n" -#: time/zic.c:488 +#: time/zic.c:487 #, c-format msgid "%s: More than one -d option specified\n" msgstr "%s: 하나 이상의 -d 옵션이 지정되었음\n" -#: time/zic.c:498 +#: time/zic.c:497 #, c-format msgid "%s: More than one -l option specified\n" msgstr "%s: 하나 이상의 -l 옵션이 지정되었음\n" -#: time/zic.c:508 +#: time/zic.c:507 #, c-format msgid "%s: More than one -p option specified\n" msgstr "%s: 하나 이상의 -p 옵션이 지정되었음\n" -#: time/zic.c:518 +#: time/zic.c:517 #, c-format msgid "%s: More than one -y option specified\n" msgstr "%s: 하나 이상의 -y 옵션이 지정되었음\n" -#: time/zic.c:1846 +#: time/zic.c:1845 #, c-format msgid "%s: command was '%s', result was %d\n" msgstr "%s: 명령은 '%s'였고, 결과는 %d였습니다\n" @@ -187,72 +172,72 @@ msgstr "%s: msgid "%s: error in state machine" msgstr "" -#: posix/getopt.c:686 +#: posix/getopt.c:687 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: 잘못된 옵션 -- %c\n" -#: posix/getopt.c:689 +#: posix/getopt.c:690 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: 부적절한 옵션 -- %c\n" -#: posix/getopt.c:610 +#: posix/getopt.c:611 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: `%c%s' 옵션은 인수를 허용하지 않습니다\n" -#: posix/getopt.c:581 +#: posix/getopt.c:582 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: `%s'는 모호한 옵션입니다\n" -#: posix/getopt.c:627 +#: posix/getopt.c:628 posix/getopt.c:801 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: `%s' 옵션은 인수가 필요합니다\n" -#: posix/getopt.c:605 +#: posix/getopt.c:606 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: `--%s' 옵션은 인수를 허용하지 않습니다\n" -#: posix/getopt.c:725 +#: posix/getopt.c:786 #, c-format -msgid "%s: option requires an argument -- %c\n" -msgstr "%s: 이 옵션은 인수가 필요합니다 -- %c\n" +msgid "%s: option `-W %s' doesn't allow an argument\n" +msgstr "%s: `-W %s' 옵션은 인수를 허용하지 않습니다\n" -#: sunrpc/rpc_main.c:146 +#: posix/getopt.c:767 #, c-format -msgid "%s: output would overwrite %s\n" -msgstr "%s: 출력이 %s를 덮어쓸 것입니다\n" +msgid "%s: option `-W %s' is ambiguous\n" +msgstr "%s: `-W %s'는 모호한 옵션입니다\n" + +#: posix/getopt.c:721 posix/getopt.c:850 +#, c-format +msgid "%s: option requires an argument -- %c\n" +msgstr "%s: 이 옵션은 인수가 필요합니다 -- %c\n" -#: time/zic.c:838 time/zic.c:1249 time/zic.c:1269 +#: time/zic.c:837 time/zic.c:1248 time/zic.c:1268 #, c-format msgid "%s: panic: Invalid l_value %d\n" msgstr "%s: panic: 부적절한 좌항값 %d\n" #: locale/programs/charmap.c:600 -#, fuzzy, c-format +#, c-format, fuzzy msgid "%s: premature end of file" -msgstr "정규식이 완결되지 않은 채 끝남" - -#: sunrpc/rpc_main.c:152 -#, c-format -msgid "%s: unable to open " -msgstr "%s: 열 수 없음" +msgstr "파일이 완결되지 않은 채 끝남" -#: posix/getopt.c:660 +#: posix/getopt.c:661 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: 인식할 수 없는 옵션 `%c%s'\n" -#: posix/getopt.c:656 +#: posix/getopt.c:657 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: 인식할 수 없는 옵션 `--%s'\n" -#: time/zic.c:447 +#: time/zic.c:446 #, c-format msgid "" "%s: usage is %s [ -s ] [ -v ] [ -l localtime ] [ -p posixrules ] [ -d " @@ -277,7 +262,7 @@ msgstr "( msgid "(unknown)" msgstr "(알 수 없음)" -#: catgets/gencat.c:244 +#: catgets/gencat.c:253 msgid "*standard input*" msgstr "*표준 입력*" @@ -285,19 +270,19 @@ msgstr "*표 msgid ".lib section in a.out corrupted" msgstr "a.out의 .lib 절이 손상되었음" -#: inet/rcmd.c:325 +#: inet/rcmd.c:328 msgid ".rhosts fstat failed" msgstr ".rhosts fstat 실패" -#: inet/rcmd.c:321 +#: inet/rcmd.c:324 msgid ".rhosts lstat failed" msgstr ".rhosts lstat 실패" -#: inet/rcmd.c:323 +#: inet/rcmd.c:326 msgid ".rhosts not regular file" msgstr ".rhosts는 일반 파일이 아님" -#: inet/rcmd.c:329 +#: inet/rcmd.c:332 msgid ".rhosts writeable by other than owner" msgstr ".rhosts는 소유자가 아닌 사람이 변경할 수 있음" @@ -310,12 +295,12 @@ msgstr "; msgid "; why = " msgstr "; 이유 = " -#: locale/programs/ld-ctype.c:325 +#: locale/programs/ld-ctype.c:326 #, c-format msgid " character must not be in class `%s'" msgstr " 문자는 `%s' 클래스에 있으면 안됩니다" -#: locale/programs/ld-ctype.c:316 +#: locale/programs/ld-ctype.c:317 #, c-format msgid " character not in class `%s'" msgstr " 문자는 `%s' 클래스에 없음" @@ -394,7 +379,7 @@ msgstr " msgid "Block device required" msgstr "블록 장치가 필요함" -#: sunrpc/pmap_rmt.c:335 +#: sunrpc/pmap_rmt.c:337 msgid "Broadcast select problem" msgstr "브로드캐스트 선택 문제" @@ -430,7 +415,7 @@ msgstr " msgid "Cannot assign requested address" msgstr "요청된 주소를 배정할 수 없습니다" -#: sunrpc/pmap_rmt.c:253 +#: sunrpc/pmap_rmt.c:255 msgid "Cannot create socket for broadcast rpc" msgstr "브로드캐스트 rpc를 위한 소켓을 만들 수 없습니다" @@ -438,7 +423,7 @@ msgstr " msgid "Cannot exec a shared library directly" msgstr "공유 라이브러리를 직접 실행할 수 없습니다" -#: sunrpc/pmap_rmt.c:347 +#: sunrpc/pmap_rmt.c:349 msgid "Cannot receive reply to broadcast" msgstr "브로드캐스트에 대한 응답을 받을 수 없습니다" @@ -451,11 +436,11 @@ msgstr " msgid "Cannot send after transport endpoint shutdown" msgstr "전송 종료지점이 지난 후에 보낼 수 없습니다" -#: sunrpc/pmap_rmt.c:311 +#: sunrpc/pmap_rmt.c:313 msgid "Cannot send broadcast packet" msgstr "브로드캐스트 패킷을 보낼 수 없습니다" -#: sunrpc/pmap_rmt.c:259 +#: sunrpc/pmap_rmt.c:261 msgid "Cannot set socket option SO_BROADCAST" msgstr "소켓 옵션 SO_BROADCAST를 설정할 수 없습니다" @@ -479,13 +464,13 @@ msgstr " msgid "Computer bought the farm" msgstr "컴퓨터가 농장을 샀습니다" -#: locale/programs/ld-ctype.c:1196 +#: locale/programs/ld-ctype.c:1197 msgid "Computing table size for character classes might take a while..." msgstr "문자 클래스의 표 크기 계산은 시간이 약간 걸릴 수 있습니다..." #: locale/programs/ld-collate.c:327 msgid "Computing table size for collation information might take a while..." -msgstr "" +msgstr "조사 정보의 표 크기 계산은 시간이 약간 걸릴 수 있습니다... " #. TRANS A remote host refused to allow the network connection (typically because #. TRANS it is not running the requested service). @@ -509,6 +494,17 @@ msgstr " msgid "Continued" msgstr "계속됨" +#: catgets/gencat.c:169 db/makedb.c:120 locale/programs/locale.c:187 +#: locale/programs/localedef.c:177 +#, c-format +msgid "" +"Copyright (C) %s Free Software Foundation, Inc.\n" +"This is free software; see the source for copying conditions. There is NO\n" +"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +msgstr "" +"저작권 (C) %s Free Software Foundation, Inc.\n" +"이 프로그램은 공개 소프트웨어입니다; 복사 조건은 소스를 참조하십시오.\n" + #. TRANS No default destination address was set for the socket. You get this #. TRANS error when you try to transmit data over a connectionless socket, #. TRANS without first specifying a destination for the data with @code{connect}. @@ -533,7 +529,6 @@ msgstr " #. TRANS For example, if you try to delete a file that is the root of a currently #. TRANS mounted filesystem, you get this error. #: stdio-common/../sysdeps/gnu/errlist.c:116 -#, fuzzy msgid "Device or resource busy" msgstr "장치나 자원이 동작 중" @@ -557,13 +552,13 @@ msgstr " msgid "Error in unknown error system: " msgstr "알 수 없는 오류 시스템에 오류: " -#: inet/ruserpass.c:156 +#: inet/ruserpass.c:161 msgid "Error: .netrc file is readable by others." msgstr "오류: .netrc 파일을 다른 사람이 읽을 수 있습니다." #: stdio-common/../sysdeps/gnu/errlist.c:662 msgid "Exchange full" -msgstr "" +msgstr "교환이 가득참" #. TRANS Invalid executable file format. This condition is detected by the #. TRANS @code{exec} functions; see @ref{Executing a File}. @@ -571,9 +566,9 @@ msgstr "" msgid "Exec format error" msgstr "Exec 형식 오류" -#: locale/programs/localedef.c:207 +#: locale/programs/localedef.c:213 msgid "FATAL: system does not define `_POSIX2_LOCALEDEF'" -msgstr "" +msgstr "중요: 시스템에 `_POSIX2_LOCALEDEF'가 정의되어 있지 않습니다" #: sunrpc/clnt_perr.c:290 msgid "Failed (unspecified error)" @@ -581,7 +576,7 @@ msgstr " #: stdio-common/../sysdeps/gnu/errlist.c:750 msgid "File descriptor in bad state" -msgstr "" +msgstr "파일 기술자가 잘못된 상태에 있음" #. TRANS File exists; an existing file was specified in a context where it only #. TRANS makes sense to specify a new file. @@ -698,9 +693,8 @@ msgid "Interrupted system call" msgstr "중단된 시스템 호출" #: stdio-common/../sysdeps/gnu/errlist.c:610 -#, fuzzy msgid "Interrupted system call should be restarted" -msgstr "중단된 시스템 호출" +msgstr "중단된 시스템 호출은 재시작되어야 합니다" #. TRANS Invalid argument. This is used to indicate various kinds of problems #. TRANS with passing the wrong argument to a library function. @@ -747,7 +741,7 @@ msgstr " #. TRANS or an incomplete sequence of bytes or the given wide character is invalid. #: stdio-common/../sysdeps/gnu/errlist.c:567 msgid "Invalid or incomplete multibyte or wide character" -msgstr "" +msgstr "부적절하거나 불완전한 다중바이트 또는 광역 문자" #: posix/regex.c:953 msgid "Invalid preceding regular expression" @@ -907,7 +901,7 @@ msgstr " msgid "No message of desired type" msgstr "적당한 형을 가진 메시지가 없음" -#: posix/regex.c:5202 +#: posix/regex.c:5204 msgid "No previous regular expression" msgstr "전의 정규식이 없음" @@ -969,9 +963,9 @@ msgstr " #. TRANS properly on the GNU system, making this error code impossible.) #: stdio-common/../sysdeps/gnu/errlist.c:502 msgid "Object is remote" -msgstr "" +msgstr "원격 개체입니다" -#: time/zic.c:1940 +#: time/zic.c:1939 msgid "Odd number of quotation marks" msgstr "따옴표가 홀수 개입니다" @@ -1030,7 +1024,7 @@ msgstr " #: stdio-common/../sysdeps/gnu/errlist.c:706 msgid "Package not installed" -msgstr "" +msgstr "패키지가 설치되지 않음" #. TRANS Permission denied; the file permissions do not allow the attempted operation. #: stdio-common/../sysdeps/gnu/errlist.c:96 @@ -1083,7 +1077,7 @@ msgstr " #: stdio-common/../sysdeps/gnu/errlist.c:734 msgid "RFS specific error" -msgstr "RFS에 국한된 오류)" +msgstr "RFS에 국한된 오류" #. TRANS ??? #: stdio-common/../sysdeps/gnu/errlist.c:527 @@ -1203,10 +1197,15 @@ msgstr " msgid "Remote address changed" msgstr "원격 주소가 바뀌었음" -#: inet/ruserpass.c:157 +#: inet/ruserpass.c:162 msgid "Remove password or make file unreadable by others." msgstr "" +#: catgets/gencat.c:224 db/makedb.c:227 locale/programs/locale.c:257 +#: locale/programs/localedef.c:408 +msgid "Report bugs to .\n" +msgstr "버그는 에 보고하십시오.\n" + #: resolv/herror.c:73 msgid "Resolver Error 0 (no error)" msgstr "리솔버 오류 0 (오류아님)" @@ -1375,7 +1374,7 @@ msgstr " #. TRANS ??? #: stdio-common/../sysdeps/gnu/errlist.c:427 msgid "Too many references: cannot splice" -msgstr "" +msgstr "참조가 너무 많음: 연결할 수 없습니다" #. TRANS The file quota system is confused because there are too many users. #. TRANS @c This can probably happen in a GNU system when using NFS. @@ -1411,18 +1410,18 @@ msgstr " msgid "Transport endpoint is not connected" msgstr "전송 종료지점이 연결되어 있지 않습니다" -#: catgets/gencat.c:202 db/makedb.c:197 locale/programs/locale.c:234 -#: locale/programs/localedef.c:383 +#: catgets/gencat.c:208 db/makedb.c:209 locale/programs/locale.c:241 +#: locale/programs/localedef.c:389 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "더 많은 정보를 보려면 `%s --help' 하십시오.\n" -#: inet/rcmd.c:118 +#: inet/rcmd.c:121 #, c-format msgid "Trying %s...\n" msgstr "%s 시도중...\n" -#: inet/ruserpass.c:241 +#: inet/ruserpass.c:246 #, c-format msgid "Unknown .netrc keyword %s" msgstr "알 수 없는 .netrc 키워드 %s" @@ -1449,7 +1448,7 @@ msgstr " msgid "Unknown signal %d" msgstr "알 수 없는 신호 %d" -#: misc/error.c:92 +#: misc/error.c:94 msgid "Unknown system error" msgstr "알 수 없는 시스템 오류" @@ -1469,16 +1468,16 @@ msgstr "짝 msgid "Unmatched \\{" msgstr "짝이 맞지 않는 \\{" -#: posix/getconf.c:184 -#, fuzzy, c-format +#: posix/getconf.c:191 +#, c-format msgid "Unrecognized variable `%s'" -msgstr "%s: 인식할 수 없는 옵션 `%c%s'\n" +msgstr "인식할 수 없는 변수 `%s'" msgid "Urgent I/O condition" msgstr "시급한 입출력 상황" -#: catgets/gencat.c:205 -#, fuzzy, c-format +#: catgets/gencat.c:212 +#, c-format msgid "" "Usage: %s [OPTION]... -o OUTPUT-FILE [INPUT-FILE]...\n" " %s [OPTION]... [OUTPUT-FILE [INPUT-FILE]...]\n" @@ -1490,22 +1489,21 @@ msgid "" " -V, --version output version information and exit\n" "If INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n" "is -, output is written to standard output.\n" -"Report bugs to .\n" msgstr "" "사용법: %s [옵션]... -o 출력-파일 [입력-파일]...\n" -" %s [옵션]... [출력-파일 [입력-파일]...]\n" +" %s [옵션]... [출력-파일 [입력-파일]...]\n" "긴 옵션에 부가되는 인수는 짧은 옵션에도 적용됩니다.\n" " -H, --header 기호 정의를 포함하는 C 헤더 파일을 만듭니다\n" " -h, --help 이 도움말을 표시하고 마칩니다\n" " --new 존재하는 목록을 사용하지 않고 새 출력 파일을 쓰게 " "합니다\n" -" -o, --output=NAME 파일 NAME으로 출력을 기록합니다\n" +" -o, --output=NAME NAME이라는 파일에 출력을 기록합니다\n" " -V, --version 버전 정보를 출력하고 마칩니다\n" "입력-파일이 - 이면 표준 입력으로부터 입력을 읽게 됩니다. 출력-파일이\n" "- 이면 표준 출력에 출력이 기록됩니다.\n" -#: db/makedb.c:200 -#, fuzzy, c-format +#: db/makedb.c:213 +#, c-format msgid "" "Usage: %s [OPTION]... INPUT-FILE OUTPUT-FILE\n" " %s [OPTION]... -o OUTPUT-FILE INPUT-FILE\n" @@ -1518,22 +1516,20 @@ msgid "" " -u, --undo print content of database file, one entry a line\n" " -V, --version output version information and exit\n" "If INPUT-FILE is -, input is read from standard input.\n" -"Report bugs to .\n" msgstr "" "사용법: %s [옵션]... 입력-파일 출력-파일\n" " %s [옵션]... -o 출력-파일 입력-파일\n" " %s [옵션]... -u 입력-파일\n" "긴 옵션에 부가되는 인수는 짧은 옵션에도 적용됩니다.\n" -" -H, --header 기호 정의를 포함하는 C 헤더 파일을 만듭니다\n" +" -f, --fold-case 키를 소문자로 변환합니다\n" " -h, --help 이 도움말을 표시하고 마칩니다\n" -" --new 존재하는 목록을 사용하지 않고 새 출력 파일을 쓰게 " -"합니다\n" -" -o, --output=NAME 파일 NAME으로 출력을 기록합니다\n" +" -o, --output=NAME NAME이라는 파일에 출력을 기록합니다\n" +" --quiet 데이터베이스를 만드는 동안 메시지를 인쇄하지 않습니다\n" +" -u, --undo 데이터베이스 파일의 내용을 한 줄에 하나씩 출력합니다\n" " -V, --version 버전 정보를 출력하고 마칩니다\n" -"입력-파일이 - 이면 표준 입력으로부터 입력을 읽게 됩니다. 출력-파일이\n" -"- 이면 표준 출력에 출력이 기록됩니다.\n" +"입력-파일이 - 이면 표준 입력으로부터 입력을 읽게 됩니다.\n" -#: locale/programs/localedef.c:386 +#: locale/programs/localedef.c:393 #, c-format msgid "" "Usage: %s [OPTION]... name\n" @@ -1550,10 +1546,9 @@ msgid "" "\n" "System's directory for character maps: %s\n" " locale files : %s\n" -"Report bugs to .\n" msgstr "" -#: locale/programs/locale.c:237 +#: locale/programs/locale.c:245 #, c-format msgid "" "Usage: %s [OPTION]... name\n" @@ -1566,10 +1561,9 @@ msgid "" "\n" " -c, --category-name write names of selected categories\n" " -k, --keyword-name write names of selected keywords\n" -"Report bugs to .\n" msgstr "" -#: posix/getconf.c:131 +#: posix/getconf.c:138 #, c-format msgid "Usage: %s variable_name [pathname]\n" msgstr "사용법: %s 변수명 [경로명]\n" @@ -1591,19 +1585,25 @@ msgstr "" msgid "Virtual timer expired" msgstr "가상 타이머의 시간이 초과됨" -#: time/zic.c:1845 +#: time/zic.c:1844 msgid "Wild result from command execution" msgstr "" msgid "Window changed" msgstr "윈도우 변경됨" +#: catgets/gencat.c:174 db/makedb.c:125 locale/programs/locale.c:192 +#: locale/programs/localedef.c:182 +#, c-format +msgid "Written by %s.\n" +msgstr "" + #. TRANS You did @strong{what}? #: stdio-common/../sysdeps/gnu/errlist.c:596 msgid "You really blew it this time" msgstr "이번엔 정말로 날려버렸습니다" -#: time/zic.c:1051 +#: time/zic.c:1050 msgid "Zone continuation line end time is not after end time of previous line" msgstr "" @@ -1640,15 +1640,11 @@ msgstr "" msgid "argument to `%s' must be a single character" msgstr "" -#: sunrpc/rpc_parse.c:326 -msgid "array declaration expected" -msgstr "배열 선언이 있어야 함" - -#: sunrpc/auth_unix.c:314 +#: sunrpc/auth_unix.c:322 msgid "auth_none.c - Fatal marshalling problem" msgstr "" -#: inet/rcmd.c:327 +#: inet/rcmd.c:330 msgid "bad .rhosts owner" msgstr "잘못된 .rhosts 소유자" @@ -1656,11 +1652,11 @@ msgstr " msgid "bad argument" msgstr "인수" -#: time/zic.c:1173 +#: time/zic.c:1172 msgid "blank FROM field on Link line" msgstr "" -#: time/zic.c:1177 +#: time/zic.c:1176 msgid "blank TO field on Link line" msgstr "" @@ -1672,19 +1668,19 @@ msgstr " msgid "bogus mcheck_status, library is buggy" msgstr "엉터리 mcheck_status, 라이브러리는 버그가 버글버글합니다" -#: sunrpc/pmap_rmt.c:177 +#: sunrpc/pmap_rmt.c:179 msgid "broadcast: ioctl (get interface configuration)" msgstr "" -#: sunrpc/pmap_rmt.c:184 +#: sunrpc/pmap_rmt.c:186 msgid "broadcast: ioctl (get interface flags)" msgstr "" -#: sunrpc/svc_udp.c:398 +#: sunrpc/svc_udp.c:402 msgid "cache_set: victim not found" msgstr "cache_set: 버릴것을 찾지 못했음" -#: time/zic.c:1686 +#: time/zic.c:1685 msgid "can't determine time zone abbrevation to use just after until time" msgstr "" @@ -1693,10 +1689,10 @@ msgstr "" msgid "can't reassign procedure number %d\n" msgstr "프로시져 번호 %d를 재지정할 수 없습니다\n" -#: locale/programs/localedef.c:281 -#, fuzzy, c-format +#: locale/programs/localedef.c:287 +#, c-format msgid "cannot `stat' locale file `%s'" -msgstr "입력 파일 `%s'를 열 수 없습니다" +msgstr "로케일 파일 `%s'를 `stat'할 수 없습니다" #: locale/programs/ld-collate.c:1313 #, c-format @@ -1712,94 +1708,94 @@ msgstr "" msgid "cannot insert new collating symbol definition: %s" msgstr "" -#: db/makedb.c:149 -#, fuzzy, c-format +#: db/makedb.c:161 +#, c-format msgid "cannot open database file `%s': %s" -msgstr "입력 파일 `%s'를 열 수 없습니다" +msgstr "데이터베이스 파일 `%s'를 열 수 없습니다: %s" -#: catgets/gencat.c:250 db/makedb.c:168 +#: catgets/gencat.c:259 db/makedb.c:180 #, c-format msgid "cannot open input file `%s'" msgstr "입력 파일 `%s'를 열 수 없습니다" -#: locale/programs/localedef.c:215 -#, fuzzy, c-format +#: locale/programs/localedef.c:221 +#, c-format msgid "cannot open locale definition file `%s'" -msgstr "입력 파일 `%s'를 열 수 없습니다" +msgstr "로케일 정의 파일 `%s'를 열 수 없습니다" -#: catgets/gencat.c:755 catgets/gencat.c:796 db/makedb.c:177 +#: catgets/gencat.c:764 catgets/gencat.c:805 db/makedb.c:189 #, c-format msgid "cannot open output file `%s'" msgstr "출력 파일 `%s'를 열 수 없습니다" #: locale/programs/locfile.c:986 -#, fuzzy, c-format +#, c-format msgid "cannot open output file `%s' for category `%s'" -msgstr "출력 파일 `%s'를 열 수 없습니다" +msgstr "출력 파일 `%s'를 범주 `%s'에 대해 열 수 없습니다" #: locale/programs/ld-collate.c:1359 msgid "cannot process order specification" msgstr "" -#: locale/programs/locale.c:293 +#: locale/programs/locale.c:303 #, c-format msgid "cannot read character map directory `%s'" msgstr "" -#: locale/programs/locale.c:268 -#, fuzzy, c-format +#: locale/programs/locale.c:278 +#, c-format msgid "cannot read locale directory `%s'" -msgstr "%s: %s 디렉토리를 만들 수 없습니다: %s\n" +msgstr "로케일 디렉토리 `%s'를 읽을 수 없습니다" -#: locale/programs/localedef.c:303 -#, fuzzy, c-format +#: locale/programs/localedef.c:309 +#, c-format msgid "cannot read locale file `%s'" -msgstr "출력 파일 `%s'를 열 수 없습니다" +msgstr "로케일 파일 `%s'를 열 수 없습니다" -#: locale/programs/localedef.c:328 -#, fuzzy, c-format +#: locale/programs/localedef.c:334 +#, c-format msgid "cannot write output files to `%s'" -msgstr "출력 파일 `%s'를 열 수 없습니다" +msgstr "출력 파일을 `%s'에 기록할 수 없습니다" -#: locale/programs/localedef.c:371 +#: locale/programs/localedef.c:377 msgid "category data requested more than once: should not happen" msgstr "" -#: locale/programs/ld-ctype.c:264 +#: locale/programs/ld-ctype.c:265 #, c-format msgid "character %s'%s' in class `%s' must be in class `%s'" msgstr "" -#: locale/programs/ld-ctype.c:288 +#: locale/programs/ld-ctype.c:289 #, c-format msgid "character %s'%s' in class `%s' must not be in class `%s'" msgstr "" -#: locale/programs/ld-ctype.c:309 +#: locale/programs/ld-ctype.c:310 msgid "character not defined in character map" msgstr "" -#: locale/programs/ld-ctype.c:1140 +#: locale/programs/ld-ctype.c:1141 #, c-format msgid "character `%c' not defined while needed as default value" msgstr "" -#: locale/programs/ld-ctype.c:938 locale/programs/ld-ctype.c:1001 -#: locale/programs/ld-ctype.c:1009 locale/programs/ld-ctype.c:1017 -#: locale/programs/ld-ctype.c:1025 locale/programs/ld-ctype.c:1033 -#: locale/programs/ld-ctype.c:1041 locale/programs/ld-ctype.c:1067 -#: locale/programs/ld-ctype.c:1075 locale/programs/ld-ctype.c:1113 -#: locale/programs/ld-ctype.c:1151 +#: locale/programs/ld-ctype.c:939 locale/programs/ld-ctype.c:1002 +#: locale/programs/ld-ctype.c:1010 locale/programs/ld-ctype.c:1018 +#: locale/programs/ld-ctype.c:1026 locale/programs/ld-ctype.c:1034 +#: locale/programs/ld-ctype.c:1042 locale/programs/ld-ctype.c:1068 +#: locale/programs/ld-ctype.c:1076 locale/programs/ld-ctype.c:1114 +#: locale/programs/ld-ctype.c:1152 #, c-format msgid "character `%s' not defined while needed as default value" msgstr "" -#: locale/programs/ld-ctype.c:800 +#: locale/programs/ld-ctype.c:801 #, c-format msgid "character class `%s' already defined" msgstr "" -#: locale/programs/ld-ctype.c:832 +#: locale/programs/ld-ctype.c:833 #, c-format msgid "character map `%s' already defined" msgstr "" @@ -1827,15 +1823,11 @@ msgstr "" msgid "collation symbol expected after `%s'" msgstr "" -#: inet/rcmd.c:112 +#: inet/rcmd.c:114 #, c-format msgid "connect to address %s: " msgstr "주소 %s에 연결: " -#: sunrpc/rpc_scan.c:109 -msgid "constant or identifier expected" -msgstr "상수나 식별자가 있어야 함" - #: sunrpc/svc_simple.c:70 msgid "couldn't create an rpc server\n" msgstr "rpc 서버를 만들 수 없습니다\n" @@ -1858,9 +1850,19 @@ msgstr " msgid "default character map file `%s' not found" msgstr "" -#: sunrpc/rpc_parse.c:77 -msgid "definition keyword expected" -msgstr "정의 명령어가 있어야 함" +#: locale/programs/ld-time.c:154 +#, c-format +msgid "" +"direction flag in string %d in `era' field in category `%s' is not '+' nor " +"'-'" +msgstr "" + +#: locale/programs/ld-time.c:164 +#, c-format +msgid "" +"direction flag in string %d in `era' field in category `%s' is not a single " +"character" +msgstr "" #: locale/programs/charset.c:87 locale/programs/charset.c:132 #, c-format @@ -1876,45 +1878,44 @@ msgstr "" msgid "duplicate definition for character `%.*s'" msgstr "" -#: db/makedb.c:295 +#: db/makedb.c:310 msgid "duplicate key" msgstr "" -#: catgets/gencat.c:369 +#: catgets/gencat.c:378 msgid "duplicate set definition" msgstr "" -#: time/zic.c:966 +#: time/zic.c:965 #, c-format msgid "duplicate zone name %s (file \"%s\", line %d)" msgstr "" -#: catgets/gencat.c:532 +#: catgets/gencat.c:541 msgid "duplicated message identifier" -msgstr "복사된 메시지 식별자" +msgstr "중복된 메시지 식별자" -#: catgets/gencat.c:505 +#: catgets/gencat.c:514 msgid "duplicated message number" -msgstr "복사된 메시지 번호" +msgstr "중복된 메시지 번호" #: locale/programs/ld-collate.c:1695 -#, fuzzy msgid "empty weight name: line ignored" -msgstr "잘못된 형태를 가진 행은 무시됨" +msgstr "" -#: sunrpc/svc_udp.c:344 +#: sunrpc/svc_udp.c:348 msgid "enablecache: cache already enabled" msgstr "enablecache: 캐쉬가 이미 활성화되어 있음" -#: sunrpc/svc_udp.c:349 +#: sunrpc/svc_udp.c:353 msgid "enablecache: could not allocate cache" msgstr "enablecache: 캐쉬를 할당할 수 없습니다" -#: sunrpc/svc_udp.c:356 +#: sunrpc/svc_udp.c:360 msgid "enablecache: could not allocate cache data" msgstr "enablecache: 캐쉬 자료를 할당할 수 없습니다" -#: sunrpc/svc_udp.c:362 +#: sunrpc/svc_udp.c:366 msgid "enablecache: could not allocate cache fifo" msgstr "enablecache: 캐쉬 fifo를 할당할 수 없습니다" @@ -1934,29 +1935,10 @@ msgstr "" msgid "expect string argument for `copy'" msgstr "" -#: sunrpc/rpc_util.c:300 -#, c-format -msgid "expected '%s'" -msgstr "'%s'가 있어야 함" - -#: sunrpc/rpc_util.c:312 -#, c-format -msgid "expected '%s' or '%s'" -msgstr "'%s'나 '%s'가 있어야 함" - -#: sunrpc/rpc_util.c:325 -#, c-format -msgid "expected '%s', '%s' or '%s'" -msgstr "'%s', '%s' 또는 '%s'가 있어야 함" - -#: time/zic.c:857 +#: time/zic.c:856 msgid "expected continuation line not found" msgstr "예상했던 연속 행을 찾지 못했음" -#: sunrpc/rpc_parse.c:384 -msgid "expected type specifier" -msgstr "형 식별자가 있어야 함" - #: locale/programs/locfile.c:1010 #, c-format msgid "failure while writing data for category `%s'" @@ -1984,31 +1966,43 @@ msgstr "" msgid "garbage at end of digit" msgstr "" +#: locale/programs/ld-time.c:183 +#, c-format +msgid "" +"garbage at end of offset value in string %d in `era' field in category `%s'" +msgstr "" + +#: locale/programs/ld-time.c:238 +#, c-format +msgid "" +"garbage at end of starting date in string %d in `era' field in category `%s'" +msgstr "" + +#: locale/programs/ld-time.c:310 +#, c-format +msgid "" +"garbage at end of stopping date in string %d in `era' field in category `%s'" +msgstr "" + #: sunrpc/get_myaddr.c:73 msgid "get_myaddress: ioctl (get interface configuration)" msgstr "" -#: time/zic.c:1150 +#: time/zic.c:1149 msgid "illegal CORRECTION field on Leap line" msgstr "" -#: time/zic.c:1154 +#: time/zic.c:1153 msgid "illegal Rolling/Stationary field on Leap line" msgstr "" #: locale/programs/ld-collate.c:1766 -#, fuzzy msgid "illegal character constant in string" -msgstr "파일에 잘못된 문자가 있음: " - -#: sunrpc/rpc_scan.c:281 -msgid "illegal character in file: " -msgstr "파일에 잘못된 문자가 있음: " +msgstr "문자열에 잘못된 문자 상수가 있음" #: locale/programs/ld-collate.c:1115 -#, fuzzy msgid "illegal collation element" -msgstr "파일에 잘못된 문자가 있음: " +msgstr "" #: locale/programs/charmap.c:196 msgid "illegal definition" @@ -2026,86 +2020,97 @@ msgstr " msgid "illegal names for character range" msgstr "문자의 범위로 잘못된 이름" -#: sunrpc/rpc_parse.c:146 -msgid "illegal result type" -msgstr "결과의 종류가 잘못되었음" +#: locale/programs/ld-time.c:176 +#, c-format +msgid "illegal number for offset in string %d in `era' field in category `%s'" +msgstr "" -#: catgets/gencat.c:342 catgets/gencat.c:419 +#: catgets/gencat.c:351 catgets/gencat.c:428 msgid "illegal set number" msgstr "집합 번호가 잘못되었음" -#: locale/programs/ld-ctype.c:806 +#: locale/programs/ld-time.c:230 +#, c-format +msgid "illegal starting date in string %d in `era' field in category `%s'" +msgstr "" + +#: locale/programs/ld-time.c:302 +#, c-format +msgid "illegal stopping date in string %d in `era' field in category `%s'" +msgstr "" + +#: locale/programs/ld-ctype.c:807 #, c-format msgid "implementation limit: no more than %d character classes allowed" msgstr "" -#: locale/programs/ld-ctype.c:838 +#: locale/programs/ld-ctype.c:839 #, c-format msgid "implementation limit: no more than %d character maps allowed" msgstr "" -#: db/makedb.c:151 +#: db/makedb.c:163 msgid "incorrectly formatted file" msgstr "잘못된 형식을 갖춘 파일" -#: time/zic.c:815 +#: time/zic.c:814 msgid "input line of unknown type" msgstr "알 수 없는 형태의 입력행" -#: time/zic.c:1734 +#: time/zic.c:1733 msgid "internal error - addtype called with bad isdst" msgstr "" -#: time/zic.c:1742 +#: time/zic.c:1741 msgid "internal error - addtype called with bad ttisgmt" msgstr "" -#: time/zic.c:1738 +#: time/zic.c:1737 msgid "internal error - addtype called with bad ttisstd" msgstr "" -#: locale/programs/ld-ctype.c:300 +#: locale/programs/ld-ctype.c:301 #, c-format msgid "internal error in %s, line %u" msgstr "%s, 행 %u에 내부 오류 발생" -#: time/zic.c:1022 +#: time/zic.c:1021 msgid "invalid GMT offset" msgstr "GMT 옵셋이 부적절함" -#: time/zic.c:1025 +#: time/zic.c:1024 msgid "invalid abbreviation format" msgstr "약어 형식이 부적절함" -#: time/zic.c:1115 time/zic.c:1314 time/zic.c:1328 +#: time/zic.c:1114 time/zic.c:1313 time/zic.c:1327 msgid "invalid day of month" msgstr "달의 날짜 수가 부적절함" -#: time/zic.c:1273 +#: time/zic.c:1272 msgid "invalid ending year" msgstr "끝나는 해가 부적절함" -#: time/zic.c:1087 +#: time/zic.c:1086 msgid "invalid leaping year" msgstr "부적절한 윤년" -#: time/zic.c:1102 time/zic.c:1205 +#: time/zic.c:1101 time/zic.c:1204 msgid "invalid month name" msgstr "달 이름이 부적절함" -#: time/zic.c:921 +#: time/zic.c:920 msgid "invalid saved time" msgstr "절약 시간이 부적절함" -#: time/zic.c:1253 +#: time/zic.c:1252 msgid "invalid starting year" msgstr "시작하는 해가 부적절함" -#: time/zic.c:1131 time/zic.c:1233 +#: time/zic.c:1130 time/zic.c:1232 msgid "invalid time of day" msgstr "" -#: time/zic.c:1319 +#: time/zic.c:1318 msgid "invalid weekday name" msgstr "부적절한 요일 이름" @@ -2117,16 +2122,16 @@ msgstr "" msgid "line before ellipsis does not contain definition for character constant" msgstr "" -#: time/zic.c:795 +#: time/zic.c:794 msgid "line too long" msgstr "행이 너무 깁니다" -#: locale/programs/localedef.c:275 +#: locale/programs/localedef.c:281 #, c-format msgid "locale file `%s', used in `copy' statement, not found" msgstr "" -#: catgets/gencat.c:600 +#: catgets/gencat.c:609 msgid "malformed line ignored" msgstr "잘못된 형태를 가진 행은 무시됨" @@ -2141,8 +2146,7 @@ msgstr "" #: locale/programs/ld-collate.c:167 locale/programs/ld-collate.c:173 #: locale/programs/ld-collate.c:177 locale/programs/ld-collate.c:1438 #: locale/programs/ld-collate.c:1467 locale/programs/locfile.c:940 -#: locale/programs/xmalloc.c:64 posix/getconf.c:174 -#, fuzzy +#: locale/programs/xmalloc.c:68 posix/getconf.c:181 msgid "memory exhausted" msgstr "메모리가 바닥남" @@ -2150,7 +2154,17 @@ msgstr " msgid "memory is consistent, library is buggy" msgstr "메모리는 견고하지만, 라이브러리는 버그가 많습니다" -#: time/zic.c:916 +#: locale/programs/ld-time.c:348 +#, c-format +msgid "missing era format in string %d in `era' field in category `%s'" +msgstr "" + +#: locale/programs/ld-time.c:337 +#, c-format +msgid "missing era name in string %d in `era' fieldin category `%s'" +msgstr "" + +#: time/zic.c:915 msgid "nameless rule" msgstr "이름없는 규칙" @@ -2159,16 +2173,12 @@ msgstr " msgid "never registered prog %d\n" msgstr "결코 등록되지 않은 프로그램 %d\n" -#: sunrpc/rpc_parse.c:305 sunrpc/rpc_parse.c:313 -msgid "no array-of-pointer declarations -- use typedef" -msgstr "포인터 배열 선언이 없습니다 -- typedef을 사용하세요" - #: locale/programs/ld-messages.c:95 locale/programs/ld-messages.c:116 #, c-format msgid "no correct regular expression for field `%s' in category `%s': %s" msgstr "" -#: time/zic.c:2060 +#: time/zic.c:2059 msgid "no day in month matches rule" msgstr "규칙에 부합되는 날이 달 안에 없음" @@ -2180,7 +2190,7 @@ msgstr "" msgid "no other keyword shall be specified when `copy' is used" msgstr "" -#: locale/programs/localedef.c:334 +#: locale/programs/localedef.c:340 msgid "no output file produced because warning were issued" msgstr "" @@ -2215,11 +2225,7 @@ msgstr "" msgid "portmap cannot create socket" msgstr "포트맵이 소켓을 만들 수 없습니다" -#: sunrpc/rpc_scan.c:456 sunrpc/rpc_scan.c:464 -msgid "preprocessor error" -msgstr "전처리기 오류" - -#: db/makedb.c:311 +#: db/makedb.c:326 #, c-format msgid "problems while reading `%s'" msgstr "" @@ -2231,7 +2237,7 @@ msgstr " #: sunrpc/rpcinfo.c:245 sunrpc/rpcinfo.c:282 sunrpc/rpcinfo.c:371 #: sunrpc/rpcinfo.c:408 sunrpc/rpcinfo.c:429 sunrpc/rpcinfo.c:462 -#, fuzzy, c-format +#, c-format msgid "program %lu version %lu is not available\n" msgstr "프로그램 %lu 버전 %lu는 사용 불가능합니다\n" @@ -2240,16 +2246,16 @@ msgstr " msgid "program %lu version %lu ready and waiting\n" msgstr "프로그램 %lu 버전 %lu는 준비되어 기다리고 있습니다\n" -#: inet/rcmd.c:154 +#: inet/rcmd.c:157 #, c-format msgid "rcmd: select (setting up stderr): %s\n" msgstr "rcmd: 선택 (표준오류 설정): %s\n" -#: inet/rcmd.c:86 +#: inet/rcmd.c:87 msgid "rcmd: socket: All ports in use\n" msgstr "rcmd: socket: 모든 포트가 사용중\n" -#: inet/rcmd.c:141 +#: inet/rcmd.c:144 #, c-format msgid "rcmd: write (setting up stderr): %s\n" msgstr "rcmd: 쓰기 (표준오류 설정): %s\n" @@ -2258,7 +2264,7 @@ msgstr "rcmd: msgid "registerrpc: out of memory\n" msgstr "registerrpc: 메모리 부족\n" -#: time/zic.c:1795 +#: time/zic.c:1794 msgid "repeated leap second moment" msgstr "" @@ -2294,28 +2300,28 @@ msgstr "rpcinfo: msgid "run_svc returned unexpectedly\n" msgstr "" -#: time/zic.c:709 time/zic.c:711 +#: time/zic.c:708 time/zic.c:710 msgid "same rule name in multiple files" msgstr "" -#: inet/rcmd.c:158 +#: inet/rcmd.c:161 msgid "select: protocol failure in circuit setup\n" msgstr "select: 회로 설정중 규약이 불이행됨\n" -#: inet/rcmd.c:176 -msgid "socket: protocol failure in circuit setup.\n" -msgstr "socket: 회로 설정중 규약이 불이행됨.\n" +#: inet/rcmd.c:179 +msgid "socket: protocol failure in circuit setup\n" +msgstr "socket: 회로 설정중 규약이 불이행됨\n" #: locale/programs/locfile.c:600 msgid "sorting order `forward' and `backward' are mutually exclusive" -msgstr "" +msgstr "정렬 순서 `forward'와 `backward'는 서로 배타적입니다" #: locale/programs/ld-collate.c:1567 locale/programs/ld-collate.c:1613 msgid "" "specification of sorting weight for collation symbol does not make sense" msgstr "" -#: time/zic.c:780 +#: time/zic.c:779 msgid "standard input" msgstr "표준 입력" @@ -2323,31 +2329,41 @@ msgstr "표 msgid "standard output" msgstr "표준 출력" -#: time/zic.c:1277 +#: locale/programs/ld-time.c:256 +#, c-format +msgid "starting date is illegal in string %d in `era' field in category `%s'" +msgstr "" + +#: time/zic.c:1276 msgid "starting year greater than ending year" msgstr "시작하는 해가 끝나는 해보다 큽니다" -#: sunrpc/svc_tcp.c:199 sunrpc/svc_tcp.c:204 +#: locale/programs/ld-time.c:328 +#, c-format +msgid "stopping date is illegal in string %d in `era' field in category `%s'" +msgstr "" + +#: sunrpc/svc_tcp.c:201 sunrpc/svc_tcp.c:206 msgid "svc_tcp: makefd_xprt: out of memory\n" msgstr "svc_tcp: makefc_xprt: 메모리 부족\n" -#: sunrpc/svc_tcp.c:147 +#: sunrpc/svc_tcp.c:149 msgid "svctcp_.c - cannot getsockname or listen" msgstr "" -#: sunrpc/svc_tcp.c:134 +#: sunrpc/svc_tcp.c:136 msgid "svctcp_.c - udp socket creation problem" msgstr "svctcp_.c - udp 소켓 생성 문제" -#: sunrpc/svc_tcp.c:154 sunrpc/svc_tcp.c:161 +#: sunrpc/svc_tcp.c:156 sunrpc/svc_tcp.c:163 msgid "svctcp_create: out of memory\n" msgstr "svctcp_create: 메모리 부족\n" -#: sunrpc/svc_udp.c:119 +#: sunrpc/svc_udp.c:123 msgid "svcudp_create - cannot getsockname" msgstr "svcudp_create - getsockname 불가능" -#: sunrpc/svc_udp.c:107 +#: sunrpc/svc_udp.c:111 msgid "svcudp_create: socket creation problem" msgstr "svcudp_create: 소켓 생성 문제" @@ -2455,15 +2471,15 @@ msgstr "" msgid "syntax error: not inside a locale definition section" msgstr "" -#: catgets/gencat.c:371 catgets/gencat.c:507 catgets/gencat.c:534 +#: catgets/gencat.c:380 catgets/gencat.c:516 catgets/gencat.c:543 msgid "this is the first definition" msgstr "이것은 첫번째 정의입니다" -#: time/zic.c:1120 +#: time/zic.c:1119 msgid "time before zero" msgstr "" -#: time/zic.c:1128 time/zic.c:1960 time/zic.c:1979 +#: time/zic.c:1127 time/zic.c:1959 time/zic.c:1978 msgid "time overflow" msgstr "시간 흘러넘침" @@ -2476,23 +2492,18 @@ msgid "too many bytes in character encoding" msgstr "" #: locale/programs/locales.h:72 -#, fuzzy msgid "too many character classes defined" -msgstr "부적절한 문자 클래스 이름" - -#: sunrpc/rpc_util.c:285 -msgid "too many files!\n" -msgstr "파일이 너무 많습니다!\n" +msgstr "문자 클래스가 너무 많이 정의되었음" -#: time/zic.c:1789 +#: time/zic.c:1788 msgid "too many leap seconds" -msgstr "윤초가 너무 많습니다" +msgstr "윤초가 너무 많음" -#: time/zic.c:1761 +#: time/zic.c:1760 msgid "too many local time types" msgstr "지역시의 종류가 너무 많음" -#: time/zic.c:1715 +#: time/zic.c:1714 msgid "too many transitions?!" msgstr "" @@ -2500,7 +2511,7 @@ msgstr "" msgid "too many weights" msgstr "" -#: time/zic.c:2083 +#: time/zic.c:2082 msgid "too many, or too long, time zone abbreviations" msgstr "" @@ -2517,7 +2528,7 @@ msgstr " msgid "two lines in a row containing `...' are not allowed" msgstr "" -#: time/zic.c:1284 +#: time/zic.c:1283 msgid "typed single year" msgstr "" @@ -2528,6 +2539,7 @@ msgstr " #: locale/programs/ld-messages.c:193 locale/programs/ld-messages.c:204 #: locale/programs/ld-messages.c:215 locale/programs/ld-messages.c:226 +#: locale/programs/ld-time.c:696 #, c-format msgid "unknown character in field `%s' of category `%s'" msgstr "" @@ -2536,12 +2548,12 @@ msgstr "" msgid "unknown collation directive" msgstr "" -#: catgets/gencat.c:468 +#: catgets/gencat.c:477 #, c-format msgid "unknown directive `%s': line ignored" msgstr "알 수 없는 지시자 `%s': 행 무시됨" -#: catgets/gencat.c:447 +#: catgets/gencat.c:456 #, c-format msgid "unknown set `%s'" msgstr "알 수 없는 설정 `%s'" @@ -2555,11 +2567,11 @@ msgstr " msgid "unknown symbol `%.*s': line ignored" msgstr "알 수 없는 기호 `%.*s': 행 무시됨" -#: time/zic.c:752 +#: time/zic.c:751 msgid "unruly zone" msgstr "" -#: catgets/gencat.c:952 +#: catgets/gencat.c:961 msgid "unterminated message" msgstr "종료되지 않은 메시지" @@ -2567,10 +2579,6 @@ msgstr " msgid "unterminated string" msgstr "종료되지 않은 문자열" -#: sunrpc/rpc_scan.c:319 -msgid "unterminated string constant" -msgstr "종료되지 않은 문자열 상수" - #: locale/programs/linereader.c:385 msgid "unterminated symbolic name" msgstr "종료되지 않은 기호 이름" @@ -2583,12 +2591,7 @@ msgstr "" msgid "upper limit in range is not smaller then lower limit" msgstr "" -#: sunrpc/rpc_main.c:78 -#, c-format -msgid "usage: %s infile\n" -msgstr "사용법: %s 입력파일\n" - -#: time/zic.c:2026 +#: time/zic.c:2025 msgid "use of 2/29 in non leap-year" msgstr "평년에 2월 29일을 사용함" @@ -2632,51 +2635,42 @@ msgstr "" msgid "values for field `%s' in category `%s' must not be zero" msgstr "" -#: sunrpc/rpc_parse.c:330 -msgid "variable-length array declaration expected" -msgstr "가변 길이 배열 선언이 있어야 함" - -#: sunrpc/rpc_parse.c:370 -msgid "voids allowed only inside union and program definitions" -msgstr "void는 오직 공용체와 프로그램 정의 내에서만 허용됩니다" - #: login/setutent_r.c:47 msgid "while opening UTMP file" msgstr "UTMP 파일을 여는 동안" -#: catgets/gencat.c:979 +#: catgets/gencat.c:988 msgid "while opening old catalog file" msgstr "오래된 목록 파일을 여는 동안" -#: db/makedb.c:338 +#: db/makedb.c:353 msgid "while reading database" msgstr "데이터베이스를 읽는 동안" -#: db/makedb.c:300 +#: db/makedb.c:315 msgid "while writing data base file" msgstr "데이터 베이스 파일을 쓰는 동안" -#: db/makedb.c:130 +#: db/makedb.c:142 msgid "wrong number of arguments" msgstr "인수의 개수가 잘못되었음" -#: time/zic.c:1078 +#: time/zic.c:1077 msgid "wrong number of fields on Leap line" msgstr "" -#: time/zic.c:1169 +#: time/zic.c:1168 msgid "wrong number of fields on Link line" msgstr "" -#: time/zic.c:912 +#: time/zic.c:911 msgid "wrong number of fields on Rule line" msgstr "" -#: time/zic.c:982 +#: time/zic.c:981 msgid "wrong number of fields on Zone continuation line" msgstr "" -#: time/zic.c:940 +#: time/zic.c:939 msgid "wrong number of fields on Zone line" msgstr "" - diff --git a/sysdeps/alpha/elf/Makefile b/sysdeps/alpha/elf/Makefile new file mode 100644 index 0000000000..db849bd9bf --- /dev/null +++ b/sysdeps/alpha/elf/Makefile @@ -0,0 +1,4 @@ +ifeq ($(subdir), csu) +extra-objs += crtbegin.o crtend.o +install-lib += crtbegin.o crtend.o +endif diff --git a/sysdeps/generic/errno-loc.c b/sysdeps/generic/errno-loc.c new file mode 100644 index 0000000000..46b9f173d1 --- /dev/null +++ b/sysdeps/generic/errno-loc.c @@ -0,0 +1,28 @@ +/* MT support function to get address of `errno' variable, non-threaded + version. + Copyright (C) 1996 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +extern int errno; + +int * +weak_const_function +__errno_location (void) +{ + return &errno; +} diff --git a/sysdeps/stub/libc-lock.h b/sysdeps/stub/libc-lock.h index bb89de25b5..158a221718 100644 --- a/sysdeps/stub/libc-lock.h +++ b/sysdeps/stub/libc-lock.h @@ -37,6 +37,9 @@ state. */ #define __libc_lock_init(NAME) +/* Same as last but this time we initialize a recursive mutex. */ +#define __libc_lock_init_recursive(NAME) + /* Finalize the named lock variable, which must be locked. It cannot be used again until __libc_lock_init is called again on it. This must be called on a lock variable before the containing storage is reused. */ diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 69c207a575..a200064a1c 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -1,9 +1,11 @@ ifeq ($(subdir), csu) CFLAGS-init-first.c = -fkeep-inline-functions + +sysdep_routines += errno-loc endif ifeq ($(subdir), misc) -sysdep_routines += sysctl clone +sysdep_routines += sysctl clone llseek sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h sys/mtio.h \ sys/module.h sys/io.h sys/klog.h sys/kdaemon.h \ diff --git a/sysdeps/unix/sysv/linux/alpha/sys/io.h b/sysdeps/unix/sysv/linux/alpha/sys/io.h index c4aa2c776c..208e793119 100644 --- a/sysdeps/unix/sysv/linux/alpha/sys/io.h +++ b/sysdeps/unix/sysv/linux/alpha/sys/io.h @@ -54,6 +54,19 @@ extern unsigned long bus_base_sparse __P ((void)) __attribute__ ((const)); extern int _hae_shift __P ((void)) __attribute__ ((const)); extern int hae_shift __P ((void)) __attribute__ ((const)); +/* Access PCI space protected from machine checks. */ +extern int pciconfig_read __P ((unsigned long int __bus, + unsigned long int __dfn, + unsigned long int __off, + unsigned long int __len, + unsigned char *__buf)); + +extern int pciconfig_write __P ((unsigned long int __bus, + unsigned long int __dfn, + unsigned long int __off, + unsigned long int __len, + unsigned char *__buf)); + __END_DECLS #endif /* _SYS_IO_H */ diff --git a/sysdeps/unix/sysv/linux/alpha/syscalls.list b/sysdeps/unix/sysv/linux/alpha/syscalls.list index 4a52bf2818..49cc697489 100644 --- a/sysdeps/unix/sysv/linux/alpha/syscalls.list +++ b/sysdeps/unix/sysv/linux/alpha/syscalls.list @@ -21,6 +21,7 @@ getdents - getdents 3 __getdirentries getdirentries getpeername - getpeername 3 __getpeername getpeername getpriority - getpriority 2 __getpriority getpriority mmap - mmap 6 __mmap mmap +llseek EXTRA lseek 3 llseek # these are actually common with the x86: fstatfs - fstatfs 2 __fstatfs fstatfs @@ -46,3 +47,7 @@ setsockopt - setsockopt 5 __setsockopt setsockopt shutdown - shutdown 2 __shutdown shutdown socketpair - socketpair 4 __socketpair socketpair sysctl - _sysctl 6 sysctl + +# access pci space protected from machine checks: +pciconfig_read EXTRA pciconfig_read 5 pciconfig_read +pciconfig_write EXTRA pciconfig_write 5 pciconfig_write diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure index 2592c6c8c8..ef7590d367 100644 --- a/sysdeps/unix/sysv/linux/configure +++ b/sysdeps/unix/sysv/linux/configure @@ -52,3 +52,25 @@ if test "$prefix" = "/usr"; then libc_cv_slibdir="/lib" libc_cv_sysconfdir="/etc" fi + +# Under Linux the LinuxThreads and crypt add-on should be available. +case $add_ons in + # Both are available. Good. + *linuxthreads*des-crypt* | *des-crypt*linuxthreads*) + ;; + *linuxthreads*) + echo "\ +*** WARNING: +*** Are you sure you do not want to use the \`crypt' add-on?" + ;; + *des-crypt*) + echo "\ +*** WARNING: +*** Are you sure you do not want to use the \`LinuxThread' add-on?" + ;; + *) + echo "\ +*** WARNING: Are you sure you do not want to use the \`LinuxThreads' +*** and \`crypt' add-ons?" + ;; +esac diff --git a/sysdeps/unix/sysv/linux/i386/brk.c b/sysdeps/unix/sysv/linux/i386/brk.c index d11c3c40d9..5bb9d59d5c 100644 --- a/sysdeps/unix/sysv/linux/i386/brk.c +++ b/sysdeps/unix/sysv/linux/i386/brk.c @@ -1,21 +1,21 @@ /* brk system call for Linux/i386. -Copyright (C) 1995, 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. - -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 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 -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + Copyright (C) 1995, 1996 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include #include diff --git a/sysdeps/unix/sysv/linux/i386/syscalls.list b/sysdeps/unix/sysv/linux/i386/syscalls.list index 63dd0bd8e2..d95a120aa0 100644 --- a/sysdeps/unix/sysv/linux/i386/syscalls.list +++ b/sysdeps/unix/sysv/linux/i386/syscalls.list @@ -1,3 +1,4 @@ # File name Caller Syscall name # args Strong name Weak names +s_llseek llseek _llseek 5 __sys_llseek vm86 - vm86 1 __vm86 vm86 diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.S b/sysdeps/unix/sysv/linux/i386/sysdep.S index d676004084..4b86d1dfe7 100644 --- a/sysdeps/unix/sysv/linux/i386/sysdep.S +++ b/sysdeps/unix/sysv/linux/i386/sysdep.S @@ -52,20 +52,3 @@ ENTRY (__syscall_error) #include #endif /* !PIC */ - - - .weak __errno_location - .type __errno_location,@function - .align 16 -__errno_location: - CALL_MCOUNT -#ifdef PIC - call .L2 -.L2: popl %ecx - addl $_GLOBAL_OFFSET_TABLE_+[.-.L2], %ecx - movl errno@GOT(%ecx), %eax -#else - movl $errno, %eax -#endif - ret -END (__errno_location) diff --git a/sysdeps/unix/sysv/linux/init-first.c b/sysdeps/unix/sysv/linux/init-first.c index 6e1d71204c..7c5b510956 100644 --- a/sysdeps/unix/sysv/linux/init-first.c +++ b/sysdeps/unix/sysv/linux/init-first.c @@ -1,21 +1,21 @@ /* Initialization code run first thing by the ELF startup code. Linux version. -Copyright (C) 1995, 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. - -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 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 -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + Copyright (C) 1995, 1996 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include #include diff --git a/sysdeps/unix/sysv/linux/llseek.c b/sysdeps/unix/sysv/linux/llseek.c new file mode 100644 index 0000000000..a1284db6be --- /dev/null +++ b/sysdeps/unix/sysv/linux/llseek.c @@ -0,0 +1,35 @@ +/* Long-long seek operation. + Copyright (C) 1996 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include + + +extern int __sys_llseek (int fd, off_t offset_hi, off_t offset_lo, + loff_t *result, int whence); + +/* Seek to OFFSET on FD, starting from WHENCE. */ +loff_t +llseek (int fd, loff_t offset, int whence) +{ + loff_t result; + + return (loff_t) (__sys_llseek (fd, (off_t) (offset >> 32), + (off_t) (offset & 0xffffffff), + &result, whence) ?: result); +} diff --git a/sysdeps/unix/sysv/linux/m68k/sysdep.S b/sysdeps/unix/sysv/linux/m68k/sysdep.S index 95e63542ee..5533be2c1b 100644 --- a/sysdeps/unix/sysv/linux/m68k/sysdep.S +++ b/sysdeps/unix/sysv/linux/m68k/sysdep.S @@ -61,16 +61,3 @@ __syscall_error: rts END (__syscall_error) #endif /* PIC */ - - .weak __errno_location - .type __errno_location,@function - .align 4 -__errno_location: - CALL_MCOUNT -#ifdef PIC - move.l (%pc, errno@GOTPC), %a0 -#else - lea errno, %a0 -#endif - rts -END (__errno_location) diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list index 01ca1bc8bb..07a3c1db4b 100644 --- a/sysdeps/unix/sysv/linux/syscalls.list +++ b/sysdeps/unix/sysv/linux/syscalls.list @@ -20,7 +20,6 @@ ioperm - ioperm 3 ioperm iopl - iopl 1 iopl ipc msgget ipc 5 __ipc klogctl EXTRA syslog 3 klogctl -llseek EXTRA _llseek 5 _llseek llseek mlock EXTRA mlock 2 __mlock mlock mlockall EXTRA mlockall 1 __mlockall mlockall mount EXTRA mount 5 __mount mount -- cgit v1.2.3