aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libio/Makefile3
-rwxr-xr-xlibio/test-freopen.sh8
-rw-r--r--manual/resource.texi4
3 files changed, 8 insertions, 7 deletions
diff --git a/libio/Makefile b/libio/Makefile
index e6a9bb7ac2..80d84e549d 100644
--- a/libio/Makefile
+++ b/libio/Makefile
@@ -100,4 +100,5 @@ include ../Rules
tests: $(objpfx)test-freopen.out
$(objpfx)test-freopen.out: test-freopen.sh $(objpfx)test-freopen
- $(SHELL) -e $< $(common-objpfx) $(common-objpfx)libio/
+ $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' \
+ $(common-objpfx)libio/
diff --git a/libio/test-freopen.sh b/libio/test-freopen.sh
index 86ce0c5260..c89e92bf93 100755
--- a/libio/test-freopen.sh
+++ b/libio/test-freopen.sh
@@ -1,6 +1,6 @@
#! /bin/sh
# Test of freopen.
-# Copyright (C) 2000 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001 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
@@ -19,10 +19,10 @@
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
common_objpfx=$1
-objpfx=$2
+run_program_prefix=$2
+objpfx=$3
-${common_objpfx}elf/ld.so --library-path $common_objpfx \
-${objpfx}test-freopen ${objpfx}test-freopen.out &&
+${run_program_prefix} ${objpfx}test-freopen ${objpfx}test-freopen.out &&
cmp ${objpfx}test-freopen.out - <<"EOF"
Hello world (mb)
Hello world (wc)
diff --git a/manual/resource.texi b/manual/resource.texi
index 3aa3f1650f..48e0ac0b72 100644
--- a/manual/resource.texi
+++ b/manual/resource.texi
@@ -1244,11 +1244,11 @@ nice (int increment)
The amount of memory available in the system and the way it is organized
determines oftentimes the way programs can and have to work. For
-functions like @code{mman} it is necessary to know about the size of
+functions like @code{mmap} it is necessary to know about the size of
individual memory pages and knowing how much memory is available enables
a program to select appropriate sizes for, say, caches. Before we get
into these details a few words about memory subsystems in traditional
-Unix systems.
+Unix systems will be given.
@menu
* Memory Subsystem:: Overview about traditional Unix memory handling.