summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Pike <r@golang.org>2011-01-18 11:01:47 -0800
committerRob Pike <r@golang.org>2011-01-18 11:01:47 -0800
commitd264da1c8456e0c252fe2cb48f0c584f6487a2a7 (patch)
treedcb54fdbade2a1f040c887c6c6b37b600cb5324b
parent1984cae9e5c5a977816dff4e1dff631d543c35eb (diff)
downloadgo-d264da1c8456e0c252fe2cb48f0c584f6487a2a7.tar.gz
tutorial: make stdin, stdout, stderr work on Windows.
R=brainman CC=golang-dev http://codereview.appspot.com/4042042
-rw-r--r--doc/go_tutorial.html8
-rw-r--r--doc/progs/file.go6
2 files changed, 7 insertions, 7 deletions
diff --git a/doc/go_tutorial.html b/doc/go_tutorial.html
index 11e9b4ad7..e3d966b87 100644
--- a/doc/go_tutorial.html
+++ b/doc/go_tutorial.html
@@ -538,9 +538,9 @@ We can use the factory to construct some familiar, exported variables of type <c
<p>
<pre> <!-- progs/file.go /var/ /^.$/ -->
24 var (
-25 Stdin = newFile(0, &quot;/dev/stdin&quot;)
-26 Stdout = newFile(1, &quot;/dev/stdout&quot;)
-27 Stderr = newFile(2, &quot;/dev/stderr&quot;)
+25 Stdin = newFile(syscall.Stdin, &quot;/dev/stdin&quot;)
+26 Stdout = newFile(syscall.Stdout, &quot;/dev/stdout&quot;)
+27 Stderr = newFile(syscall.Stderr, &quot;/dev/stderr&quot;)
28 )
</pre>
<p>
@@ -663,7 +663,7 @@ something from the directory of installed packages.
(Also, ''<code>file.go</code>'' must be compiled before we can import the
package.)
<p>
-Now we can compile and run the program:
+Now we can compile and run the program. On Unix, this would be the result:
<p>
<pre>
$ 6g file.go # compile file package
diff --git a/doc/progs/file.go b/doc/progs/file.go
index d3fb5ae9e..df3a3cf71 100644
--- a/doc/progs/file.go
+++ b/doc/progs/file.go
@@ -22,9 +22,9 @@ func newFile(fd int, name string) *File {
}
var (
- Stdin = newFile(0, "/dev/stdin")
- Stdout = newFile(1, "/dev/stdout")
- Stderr = newFile(2, "/dev/stderr")
+ Stdin = newFile(syscall.Stdin, "/dev/stdin")
+ Stdout = newFile(syscall.Stdout, "/dev/stdout")
+ Stderr = newFile(syscall.Stderr, "/dev/stderr")
)
func Open(name string, mode int, perm uint32) (file *File, err os.Error) {