summaryrefslogtreecommitdiffstats
path: root/scilab/modules/io
diff options
context:
space:
mode:
authorAllan CORNET <allan.cornet@scilab.org>2010-03-08 09:28:07 +0100
committerAllan CORNET <allan.cornet@scilab.org>2010-03-08 09:28:07 +0100
commit8b7ac05e63459066060daee277f1a41d5b8905d3 (patch)
tree4279ccbffa71e2a0697c866471a0f02e12148c58 /scilab/modules/io
parent4c6a4300d0c9a42b71fb8572e6a656ee3bcb3bdf (diff)
downloadscilab-8b7ac05e63459066060daee277f1a41d5b8905d3.zip
scilab-8b7ac05e63459066060daee277f1a41d5b8905d3.tar.gz
MSDOS replaced by getos() == 'Windows'
Diffstat (limited to 'scilab/modules/io')
-rw-r--r--scilab/modules/io/help/en_US/host.xml2
-rw-r--r--scilab/modules/io/help/en_US/read.xml2
-rw-r--r--scilab/modules/io/help/en_US/unix.xml4
-rw-r--r--scilab/modules/io/help/en_US/unix_g.xml2
-rw-r--r--scilab/modules/io/help/en_US/unix_s.xml2
-rw-r--r--scilab/modules/io/help/en_US/unix_w.xml2
-rw-r--r--scilab/modules/io/help/en_US/unix_x.xml2
-rw-r--r--scilab/modules/io/help/en_US/write.xml4
-rw-r--r--scilab/modules/io/help/fr_FR/host.xml2
-rw-r--r--scilab/modules/io/help/fr_FR/unix.xml4
-rw-r--r--scilab/modules/io/help/fr_FR/unix_g.xml2
-rw-r--r--scilab/modules/io/help/fr_FR/unix_s.xml2
-rw-r--r--scilab/modules/io/help/fr_FR/unix_w.xml2
-rw-r--r--scilab/modules/io/help/fr_FR/unix_x.xml2
-rw-r--r--scilab/modules/io/help/pt_BR/host.xml2
-rw-r--r--scilab/modules/io/help/pt_BR/read.xml2
-rw-r--r--scilab/modules/io/help/pt_BR/unix.xml4
-rw-r--r--scilab/modules/io/help/pt_BR/unix_g.xml2
-rw-r--r--scilab/modules/io/help/pt_BR/unix_s.xml2
-rw-r--r--scilab/modules/io/help/pt_BR/unix_w.xml2
-rw-r--r--scilab/modules/io/help/pt_BR/unix_x.xml2
-rw-r--r--scilab/modules/io/help/pt_BR/write.xml4
-rw-r--r--scilab/modules/io/macros/unix_g.sci2
-rw-r--r--scilab/modules/io/macros/unix_s.sci2
-rw-r--r--scilab/modules/io/macros/unix_w.sci2
-rw-r--r--scilab/modules/io/macros/unix_x.sci2
-rw-r--r--scilab/modules/io/tests/nonreg_tests/bug_1969.dia.ref2
-rw-r--r--scilab/modules/io/tests/nonreg_tests/bug_1969.tst2
-rw-r--r--scilab/modules/io/tests/unit_tests/searchenv.encoding.dia.ref4
-rw-r--r--scilab/modules/io/tests/unit_tests/searchenv.encoding.tst4
30 files changed, 37 insertions, 37 deletions
diff --git a/scilab/modules/io/help/en_US/host.xml b/scilab/modules/io/help/en_US/host.xml
index f0fca09..46e9d90 100644
--- a/scilab/modules/io/help/en_US/host.xml
+++ b/scilab/modules/io/help/en_US/host.xml
@@ -51,7 +51,7 @@
51 <programlisting role="example"><![CDATA[ 51 <programlisting role="example"><![CDATA[
52//create a getdir function based on host 52//create a getdir function based on host
53function wd=getdir() 53function wd=getdir()
54 if MSDOS then 54 if getos() == 'Windows' then
55 host('cd>'+TMPDIR+'\path'); 55 host('cd>'+TMPDIR+'\path');
56 else 56 else
57 host('pwd>'+TMPDIR+'/path'); 57 host('pwd>'+TMPDIR+'/path');
diff --git a/scilab/modules/io/help/en_US/read.xml b/scilab/modules/io/help/en_US/read.xml
index c924bc1..c58251d 100644
--- a/scilab/modules/io/help/en_US/read.xml
+++ b/scilab/modules/io/help/en_US/read.xml
@@ -95,7 +95,7 @@
95 <refsection> 95 <refsection>
96 <title>Examples</title> 96 <title>Examples</title>
97 <programlisting role="example"><![CDATA[ 97 <programlisting role="example"><![CDATA[
98if MSDOS then unix('del foo'); 98if getos() == 'Windows' then unix('del foo');
99else unix('rm -f foo'); end 99else unix('rm -f foo'); end
100A=rand(3,5); write('foo',A); 100A=rand(3,5); write('foo',A);
101B=read('foo',3,5) 101B=read('foo',3,5)
diff --git a/scilab/modules/io/help/en_US/unix.xml b/scilab/modules/io/help/en_US/unix.xml
index 5d1eb19..ad177cc 100644
--- a/scilab/modules/io/help/en_US/unix.xml
+++ b/scilab/modules/io/help/en_US/unix.xml
@@ -50,12 +50,12 @@
50 <refsection> 50 <refsection>
51 <title>Examples</title> 51 <title>Examples</title>
52 <programlisting role="example"><![CDATA[ 52 <programlisting role="example"><![CDATA[
53if ~MSDOS then 53if getos() <> 'Windows' then
54 unix("ls $SCI/demos"); 54 unix("ls $SCI/demos");
55end 55end
56 56
57function wd=directory() 57function wd=directory()
58 if MSDOS then 58 if getos() == 'Windows' then
59 unix('cd>'+TMPDIR+'\path'); 59 unix('cd>'+TMPDIR+'\path');
60 else 60 else
61 unix('pwd>'+TMPDIR+'/path'); 61 unix('pwd>'+TMPDIR+'/path');
diff --git a/scilab/modules/io/help/en_US/unix_g.xml b/scilab/modules/io/help/en_US/unix_g.xml
index da5d155..0da90ac 100644
--- a/scilab/modules/io/help/en_US/unix_g.xml
+++ b/scilab/modules/io/help/en_US/unix_g.xml
@@ -94,7 +94,7 @@
94 <programlisting role="example"><![CDATA[ 94 <programlisting role="example"><![CDATA[
95function d=DIR(path) 95function d=DIR(path)
96 path=pathconvert(path,%t,%t) 96 path=pathconvert(path,%t,%t)
97 if MSDOS then 97 if getos() == 'Windows' then
98 d=unix_g('dir '+path) 98 d=unix_g('dir '+path)
99 else 99 else
100 d=unix_g('ls '+path) 100 d=unix_g('ls '+path)
diff --git a/scilab/modules/io/help/en_US/unix_s.xml b/scilab/modules/io/help/en_US/unix_s.xml
index 6dafc42..bf38556 100644
--- a/scilab/modules/io/help/en_US/unix_s.xml
+++ b/scilab/modules/io/help/en_US/unix_s.xml
@@ -45,7 +45,7 @@
45 <refsection> 45 <refsection>
46 <title>Examples</title> 46 <title>Examples</title>
47 <programlisting role="example"><![CDATA[ 47 <programlisting role="example"><![CDATA[
48if MSDOS then 48if getos() == 'Windows' then
49 unix_s("del foo"); 49 unix_s("del foo");
50else 50else
51 unix_s("rm -f foo"); 51 unix_s("rm -f foo");
diff --git a/scilab/modules/io/help/en_US/unix_w.xml b/scilab/modules/io/help/en_US/unix_w.xml
index 29e51fa..cc14e0e 100644
--- a/scilab/modules/io/help/en_US/unix_w.xml
+++ b/scilab/modules/io/help/en_US/unix_w.xml
@@ -45,7 +45,7 @@
45 <refsection> 45 <refsection>
46 <title>Examples</title> 46 <title>Examples</title>
47 <programlisting role="example"><![CDATA[ 47 <programlisting role="example"><![CDATA[
48if MSDOS then 48if getos() == 'Windows' then
49 unix_w("dir "+'""'+WSCI+"\modules"+'""'); 49 unix_w("dir "+'""'+WSCI+"\modules"+'""');
50else 50else
51 unix_w("ls $SCI/modules"); 51 unix_w("ls $SCI/modules");
diff --git a/scilab/modules/io/help/en_US/unix_x.xml b/scilab/modules/io/help/en_US/unix_x.xml
index 5f2b2b0..42acd65 100644
--- a/scilab/modules/io/help/en_US/unix_x.xml
+++ b/scilab/modules/io/help/en_US/unix_x.xml
@@ -44,7 +44,7 @@
44 <refsection> 44 <refsection>
45 <title>Examples</title> 45 <title>Examples</title>
46 <programlisting role="example"><![CDATA[ 46 <programlisting role="example"><![CDATA[
47if MSDOS then 47if getos() == 'Windows' then
48 unix_x("dir "+""""+WSCI+"modules\graphics\demos"+""""); 48 unix_x("dir "+""""+WSCI+"modules\graphics\demos"+"""");
49else 49else
50 unix_x("ls $SCI/modules/graphics/demos"); 50 unix_x("ls $SCI/modules/graphics/demos");
diff --git a/scilab/modules/io/help/en_US/write.xml b/scilab/modules/io/help/en_US/write.xml
index 64dc643..15e747f 100644
--- a/scilab/modules/io/help/en_US/write.xml
+++ b/scilab/modules/io/help/en_US/write.xml
@@ -109,7 +109,7 @@ write(file-desc,a,k,format)</synopsis>
109 <title>Examples</title> 109 <title>Examples</title>
110 110
111 <programlisting role="example"><![CDATA[ 111 <programlisting role="example"><![CDATA[
112if MSDOS then unix('del asave'); 112if getos() == 'Windows' then unix('del asave');
113else unix('rm -f asave'); end 113else unix('rm -f asave'); end
114A=rand(5,3); write('asave',A); A=read('asave',5,3); 114A=rand(5,3); write('asave',A); A=read('asave',5,3);
115write(%io(2),A,'('' | '',3(f10.3,'' | ''))') 115write(%io(2),A,'('' | '',3(f10.3,'' | ''))')
@@ -117,7 +117,7 @@ write(%io(2),string(1:10))
117write(%io(2),strcat(string(1:10),',')) 117write(%io(2),strcat(string(1:10),','))
118write(%io(2),1:10,'(10(i2,3x))') 118write(%io(2),1:10,'(10(i2,3x))')
119 119
120if MSDOS then unix('del foo'); 120if getos() == 'Windows' then unix('del foo');
121else unix('rm -f foo'); end 121else unix('rm -f foo'); end
122write('foo',A) 122write('foo',A)
123 ]]></programlisting> 123 ]]></programlisting>
diff --git a/scilab/modules/io/help/fr_FR/host.xml b/scilab/modules/io/help/fr_FR/host.xml
index 6f3eba1..f34e8c9 100644
--- a/scilab/modules/io/help/fr_FR/host.xml
+++ b/scilab/modules/io/help/fr_FR/host.xml
@@ -57,7 +57,7 @@
57 <programlisting role="example"><![CDATA[ 57 <programlisting role="example"><![CDATA[
58//creation d'un fontion pour recuperer la path courant 58//creation d'un fontion pour recuperer la path courant
59function wd=getdir() 59function wd=getdir()
60 if MSDOS then 60 if getos() == 'Windows' then
61 host('cd>'+TMPDIR+'\path'); 61 host('cd>'+TMPDIR+'\path');
62 else 62 else
63 host('pwd>'+TMPDIR+'/path'); 63 host('pwd>'+TMPDIR+'/path');
diff --git a/scilab/modules/io/help/fr_FR/unix.xml b/scilab/modules/io/help/fr_FR/unix.xml
index e2b348f..69803e1 100644
--- a/scilab/modules/io/help/fr_FR/unix.xml
+++ b/scilab/modules/io/help/fr_FR/unix.xml
@@ -53,12 +53,12 @@
53 <refsection> 53 <refsection>
54 <title>Exemples</title> 54 <title>Exemples</title>
55 <programlisting role="example"><![CDATA[ 55 <programlisting role="example"><![CDATA[
56if ~MSDOS then 56if getos() <> 'Windows' then
57 unix("ls $SCI/demos"); 57 unix("ls $SCI/demos");
58end 58end
59 59
60function wd=directory() 60function wd=directory()
61 if MSDOS then 61 if getos() == 'Windows' then
62 unix('cd>'+TMPDIR+'\path'); 62 unix('cd>'+TMPDIR+'\path');
63 else 63 else
64 unix('pwd>'+TMPDIR+'/path'); 64 unix('pwd>'+TMPDIR+'/path');
diff --git a/scilab/modules/io/help/fr_FR/unix_g.xml b/scilab/modules/io/help/fr_FR/unix_g.xml
index 4fd6f09..923b749 100644
--- a/scilab/modules/io/help/fr_FR/unix_g.xml
+++ b/scilab/modules/io/help/fr_FR/unix_g.xml
@@ -98,7 +98,7 @@
98 <programlisting role="example"><![CDATA[ 98 <programlisting role="example"><![CDATA[
99function d=DIR(path) 99function d=DIR(path)
100 path=pathconvert(path,%t,%t) 100 path=pathconvert(path,%t,%t)
101 if MSDOS then 101 if getos() == 'Windows' then
102 d=unix_g('dir '+path) 102 d=unix_g('dir '+path)
103 else 103 else
104 d=unix_g('ls '+path) 104 d=unix_g('ls '+path)
diff --git a/scilab/modules/io/help/fr_FR/unix_s.xml b/scilab/modules/io/help/fr_FR/unix_s.xml
index 7ca6005..14f9e5a 100644
--- a/scilab/modules/io/help/fr_FR/unix_s.xml
+++ b/scilab/modules/io/help/fr_FR/unix_s.xml
@@ -43,7 +43,7 @@
43 <refsection> 43 <refsection>
44 <title>Exemples</title> 44 <title>Exemples</title>
45 <programlisting role="example"><![CDATA[ 45 <programlisting role="example"><![CDATA[
46if MSDOS then 46if getos() == 'Windows' then
47 unix_s("del foo"); 47 unix_s("del foo");
48else 48else
49 unix_s("rm -f foo"); 49 unix_s("rm -f foo");
diff --git a/scilab/modules/io/help/fr_FR/unix_w.xml b/scilab/modules/io/help/fr_FR/unix_w.xml
index 2b7ac23..b8acbcb 100644
--- a/scilab/modules/io/help/fr_FR/unix_w.xml
+++ b/scilab/modules/io/help/fr_FR/unix_w.xml
@@ -47,7 +47,7 @@
47 <refsection> 47 <refsection>
48 <title>Exemples</title> 48 <title>Exemples</title>
49 <programlisting role="example"><![CDATA[ 49 <programlisting role="example"><![CDATA[
50if MSDOS then 50if getos() == 'Windows' then
51 unix_w("dir "+'""'+WSCI+"\modules"+'""'); 51 unix_w("dir "+'""'+WSCI+"\modules"+'""');
52else 52else
53 unix_w("ls $SCI/modules"); 53 unix_w("ls $SCI/modules");
diff --git a/scilab/modules/io/help/fr_FR/unix_x.xml b/scilab/modules/io/help/fr_FR/unix_x.xml
index 7e54736..6632670 100644
--- a/scilab/modules/io/help/fr_FR/unix_x.xml
+++ b/scilab/modules/io/help/fr_FR/unix_x.xml
@@ -48,7 +48,7 @@
48 <refsection> 48 <refsection>
49 <title>Exemples</title> 49 <title>Exemples</title>
50 <programlisting role="example"><![CDATA[ 50 <programlisting role="example"><![CDATA[
51if MSDOS then 51if getos() == 'Windows' then
52 unix_x("dir "+""""+WSCI+"modules\graphics\demos"+""""); 52 unix_x("dir "+""""+WSCI+"modules\graphics\demos"+"""");
53else 53else
54 unix_x("ls $SCI/modules/graphics/demos"); 54 unix_x("ls $SCI/modules/graphics/demos");
diff --git a/scilab/modules/io/help/pt_BR/host.xml b/scilab/modules/io/help/pt_BR/host.xml
index 227bf59..5a3e2ef 100644
--- a/scilab/modules/io/help/pt_BR/host.xml
+++ b/scilab/modules/io/help/pt_BR/host.xml
@@ -72,7 +72,7 @@
72 <programlisting role="example"><![CDATA[ 72 <programlisting role="example"><![CDATA[
73//criando uma funo getdir baseda no host 73//criando uma funo getdir baseda no host
74function wd=getdir() 74function wd=getdir()
75 if MSDOS then 75 if getos() == 'Windows' then
76 host('cd>'+TMPDIR+'\path'); 76 host('cd>'+TMPDIR+'\path');
77 else 77 else
78 host('pwd>'+TMPDIR+'/path'); 78 host('pwd>'+TMPDIR+'/path');
diff --git a/scilab/modules/io/help/pt_BR/read.xml b/scilab/modules/io/help/pt_BR/read.xml
index ed95761..e59de82 100644
--- a/scilab/modules/io/help/pt_BR/read.xml
+++ b/scilab/modules/io/help/pt_BR/read.xml
@@ -129,7 +129,7 @@
129 <title>Exemplos</title> 129 <title>Exemplos</title>
130 130
131 <programlisting role="example"><![CDATA[ 131 <programlisting role="example"><![CDATA[
132if MSDOS then unix('del foo'); 132if getos() == 'Windows' then unix('del foo');
133else unix('rm -f foo'); end 133else unix('rm -f foo'); end
134A=rand(3,5); write('foo',A); 134A=rand(3,5); write('foo',A);
135B=read('foo',3,5) 135B=read('foo',3,5)
diff --git a/scilab/modules/io/help/pt_BR/unix.xml b/scilab/modules/io/help/pt_BR/unix.xml
index 29ad82e..318fa1d 100644
--- a/scilab/modules/io/help/pt_BR/unix.xml
+++ b/scilab/modules/io/help/pt_BR/unix.xml
@@ -69,12 +69,12 @@
69 <title>Exemplos</title> 69 <title>Exemplos</title>
70 70
71 <programlisting role="example"><![CDATA[ 71 <programlisting role="example"><![CDATA[
72if ~MSDOS then 72if getos() <> 'Windows' then
73 unix("ls $SCI/demos"); 73 unix("ls $SCI/demos");
74end 74end
75 75
76function wd=directory() 76function wd=directory()
77 if MSDOS then 77 if getos() == 'Windows' then
78 unix('cd&gt;'+TMPDIR+'\path'); 78 unix('cd&gt;'+TMPDIR+'\path');
79 else 79 else
80 unix('pwd&gt;'+TMPDIR+'/path'); 80 unix('pwd&gt;'+TMPDIR+'/path');
diff --git a/scilab/modules/io/help/pt_BR/unix_g.xml b/scilab/modules/io/help/pt_BR/unix_g.xml
index 663f9e6..03a0387 100644
--- a/scilab/modules/io/help/pt_BR/unix_g.xml
+++ b/scilab/modules/io/help/pt_BR/unix_g.xml
@@ -94,7 +94,7 @@
94 <programlisting role="example"><![CDATA[ 94 <programlisting role="example"><![CDATA[
95function d=DIR(path) 95function d=DIR(path)
96 path=pathconvert(path,%t,%t) 96 path=pathconvert(path,%t,%t)
97 if MSDOS then 97 if getos() == 'Windows' then
98 d=unix_g('dir '+path) 98 d=unix_g('dir '+path)
99 else 99 else
100 d=unix_g('ls '+path) 100 d=unix_g('ls '+path)
diff --git a/scilab/modules/io/help/pt_BR/unix_s.xml b/scilab/modules/io/help/pt_BR/unix_s.xml
index ef16a3c..2e52429 100644
--- a/scilab/modules/io/help/pt_BR/unix_s.xml
+++ b/scilab/modules/io/help/pt_BR/unix_s.xml
@@ -61,7 +61,7 @@
61 <title>Exemplos</title> 61 <title>Exemplos</title>
62 62
63 <programlisting role="example"><![CDATA[ 63 <programlisting role="example"><![CDATA[
64if MSDOS then 64if getos() == 'Windows' then
65 unix_s("del foo"); 65 unix_s("del foo");
66else 66else
67 unix_s("rm -f foo"); 67 unix_s("rm -f foo");
diff --git a/scilab/modules/io/help/pt_BR/unix_w.xml b/scilab/modules/io/help/pt_BR/unix_w.xml
index 591ce52..c865952 100644
--- a/scilab/modules/io/help/pt_BR/unix_w.xml
+++ b/scilab/modules/io/help/pt_BR/unix_w.xml
@@ -62,7 +62,7 @@
62 <title>Exemplos</title> 62 <title>Exemplos</title>
63 63
64 <programlisting role="example"><![CDATA[ 64 <programlisting role="example"><![CDATA[
65if MSDOS then 65if getos() == 'Windows' then
66 unix_w("dir "+'""'+WSCI+"\modules"+'""'); 66 unix_w("dir "+'""'+WSCI+"\modules"+'""');
67else 67else
68 unix_w("ls $SCI/modules"); 68 unix_w("ls $SCI/modules");
diff --git a/scilab/modules/io/help/pt_BR/unix_x.xml b/scilab/modules/io/help/pt_BR/unix_x.xml
index 011ff83..d829611 100644
--- a/scilab/modules/io/help/pt_BR/unix_x.xml
+++ b/scilab/modules/io/help/pt_BR/unix_x.xml
@@ -62,7 +62,7 @@
62 <title>Exemplos</title> 62 <title>Exemplos</title>
63 63
64 <programlisting role="example"><![CDATA[ 64 <programlisting role="example"><![CDATA[
65if MSDOS then 65if getos() == 'Windows' then
66 unix_x("dir "+""""+WSCI+"modules\graphics\demos"+""""); 66 unix_x("dir "+""""+WSCI+"modules\graphics\demos"+"""");
67else 67else
68 unix_x("ls $SCI/modules/graphics/demos"); 68 unix_x("ls $SCI/modules/graphics/demos");
diff --git a/scilab/modules/io/help/pt_BR/write.xml b/scilab/modules/io/help/pt_BR/write.xml
index 86a5a3e..5669555 100644
--- a/scilab/modules/io/help/pt_BR/write.xml
+++ b/scilab/modules/io/help/pt_BR/write.xml
@@ -106,7 +106,7 @@ write(file-desc,a,k,format)</synopsis>
106 <title>Exemplos</title> 106 <title>Exemplos</title>
107 107
108 <programlisting role="example"><![CDATA[ 108 <programlisting role="example"><![CDATA[
109if MSDOS then unix('del asave'); 109if getos() == 'Windows' then unix('del asave');
110else unix('rm -f asave'); end 110else unix('rm -f asave'); end
111A=rand(5,3); write('asave',A); A=read('asave',5,3); 111A=rand(5,3); write('asave',A); A=read('asave',5,3);
112write(%io(2),A,'('' | '',3(f10.3,'' | ''))') 112write(%io(2),A,'('' | '',3(f10.3,'' | ''))')
@@ -114,7 +114,7 @@ write(%io(2),string(1:10))
114write(%io(2),strcat(string(1:10),',')) 114write(%io(2),strcat(string(1:10),','))
115write(%io(2),1:10,'(10(i2,3x))') 115write(%io(2),1:10,'(10(i2,3x))')
116 116
117if MSDOS then unix('del foo'); 117if getos() == 'Windows' then unix('del foo');
118else unix('rm -f foo'); end 118else unix('rm -f foo'); end
119write('foo',A) 119write('foo',A)
120 ]]></programlisting> 120 ]]></programlisting>
diff --git a/scilab/modules/io/macros/unix_g.sci b/scilab/modules/io/macros/unix_g.sci
index bf5a6e0..2fb37c2 100644
--- a/scilab/modules/io/macros/unix_g.sci
+++ b/scilab/modules/io/macros/unix_g.sci
@@ -49,7 +49,7 @@ function varargout = unix_g(cmd)
49 stat = 1; 49 stat = 1;
50 rep = emptystr(); 50 rep = emptystr();
51 51
52 if MSDOS then 52 if getos() == 'Windows' then
53 [rep,stat] = dos(cmd); 53 [rep,stat] = dos(cmd);
54 if (stat == %t) then 54 if (stat == %t) then
55 stat = 0; 55 stat = 0;
diff --git a/scilab/modules/io/macros/unix_s.sci b/scilab/modules/io/macros/unix_s.sci
index ed06820..ae73ca7 100644
--- a/scilab/modules/io/macros/unix_s.sci
+++ b/scilab/modules/io/macros/unix_s.sci
@@ -37,7 +37,7 @@ function unix_s(cmd)
37 error(msprintf(gettext("%s: Wrong size for input argument #%d: A string expected.\n"),"unix_s",1)); 37 error(msprintf(gettext("%s: Wrong size for input argument #%d: A string expected.\n"),"unix_s",1));
38 end 38 end
39 39
40 if MSDOS then 40 if getos() == 'Windows' then
41 [rep,stat]=dos(cmd); 41 [rep,stat]=dos(cmd);
42 if (~stat) then 42 if (~stat) then
43 for i=1:size(rep,'*') do write(%io(2),' '+rep(i));end 43 for i=1:size(rep,'*') do write(%io(2),' '+rep(i));end
diff --git a/scilab/modules/io/macros/unix_w.sci b/scilab/modules/io/macros/unix_w.sci
index e972057..ccd02a0 100644
--- a/scilab/modules/io/macros/unix_w.sci
+++ b/scilab/modules/io/macros/unix_w.sci
@@ -38,7 +38,7 @@ function unix_w(cmd)
38 error(msprintf(gettext("%s: Wrong size for input argument #%d: A string expected.\n"),"unix_w",1)); 38 error(msprintf(gettext("%s: Wrong size for input argument #%d: A string expected.\n"),"unix_w",1));
39 end 39 end
40 40
41 if MSDOS then 41 if getos() == 'Windows' then
42 [rep,stat]=dos(cmd,'-echo'); 42 [rep,stat]=dos(cmd,'-echo');
43 if (~stat) then 43 if (~stat) then
44 error(msprintf(gettext("%s: error during ""%s"" execution"),"unix_w",cmd)); 44 error(msprintf(gettext("%s: error during ""%s"" execution"),"unix_w",cmd));
diff --git a/scilab/modules/io/macros/unix_x.sci b/scilab/modules/io/macros/unix_x.sci
index 8fa03d7..312da1d 100644
--- a/scilab/modules/io/macros/unix_x.sci
+++ b/scilab/modules/io/macros/unix_x.sci
@@ -38,7 +38,7 @@ function unix_x(cmd)
38 error(msprintf(gettext("%s: Wrong size for input argument #%d: A string expected.\n"),"unix_x",1)); 38 error(msprintf(gettext("%s: Wrong size for input argument #%d: A string expected.\n"),"unix_x",1));
39 end 39 end
40 40
41if MSDOS then 41if getos() == 'Windows' then
42 [rep,stat]=dos(cmd); 42 [rep,stat]=dos(cmd);
43 if (stat) then 43 if (stat) then
44 messagebox(rep); 44 messagebox(rep);
diff --git a/scilab/modules/io/tests/nonreg_tests/bug_1969.dia.ref b/scilab/modules/io/tests/nonreg_tests/bug_1969.dia.ref
index 371a13e..1f3e850 100644
--- a/scilab/modules/io/tests/nonreg_tests/bug_1969.dia.ref
+++ b/scilab/modules/io/tests/nonreg_tests/bug_1969.dia.ref
@@ -81,6 +81,6 @@ a=msprintf("%2.5f ",s')
81 2932 -1.39543 0.43100 -0.68092 0.71227 0.77090 -0.97015 -0.80298 81 2932 -1.39543 0.43100 -0.68092 0.71227 0.77090 -0.97015 -0.80298
82 0.93324 -0.15644 1.80970 0.12123 0.02858 -1.00312 0.97391 0.99897 82 0.93324 -0.15644 1.80970 0.12123 0.02858 -1.00312 0.97391 0.99897
83 0.47892 -0.02918 83 0.47892 -0.02918
84if ~MSDOS then 84if getos() <> 'Windows' then
85 if unix("cat "+a+" > /dev/null 2>&1")<>256 then bugmes();quit;end 85 if unix("cat "+a+" > /dev/null 2>&1")<>256 then bugmes();quit;end
86end 86end
diff --git a/scilab/modules/io/tests/nonreg_tests/bug_1969.tst b/scilab/modules/io/tests/nonreg_tests/bug_1969.tst
index b61ac7b..7f17147 100644
--- a/scilab/modules/io/tests/nonreg_tests/bug_1969.tst
+++ b/scilab/modules/io/tests/nonreg_tests/bug_1969.tst
@@ -16,6 +16,6 @@
16s=grand(500,1,'nor',0,1)'; 16s=grand(500,1,'nor',0,1)';
17a=msprintf("%2.5f ",s') 17a=msprintf("%2.5f ",s')
18 18
19if ~MSDOS then 19if getos() <> 'Windows' then
20 if unix("cat "+a+" > /dev/null 2>&1")<>256 then pause,end 20 if unix("cat "+a+" > /dev/null 2>&1")<>256 then pause,end
21end 21end
diff --git a/scilab/modules/io/tests/unit_tests/searchenv.encoding.dia.ref b/scilab/modules/io/tests/unit_tests/searchenv.encoding.dia.ref
index a7a06f6..2c15779 100644
--- a/scilab/modules/io/tests/unit_tests/searchenv.encoding.dia.ref
+++ b/scilab/modules/io/tests/unit_tests/searchenv.encoding.dia.ref
@@ -8,7 +8,7 @@ ilib_verbose(0);
8mydir = TMPDIR + filesep() + "loadlib"; 8mydir = TMPDIR + filesep() + "loadlib";
9createdir(mydir); 9createdir(mydir);
10chdir(mydir); 10chdir(mydir);
11if MSDOS then 11if getos() == 'Windows' then
12 unix_w(jre_path()+"\bin\java.exe -cp "+SCI+"\modules\localization\tests\unit_tests CreateDir"); 12 unix_w(jre_path()+"\bin\java.exe -cp "+SCI+"\modules\localization\tests\unit_tests CreateDir");
13else 13else
14 unix_w(jre_path()+"/bin/java -classpath "+SCI+"/modules/localization/tests/unit_tests CreateDir"); 14 unix_w(jre_path()+"/bin/java -classpath "+SCI+"/modules/localization/tests/unit_tests CreateDir");
@@ -24,7 +24,7 @@ tab_ref = [
24"프로그램", 24"프로그램",
25"תוכנית"]; 25"תוכנית"];
26PathOrigin = getenv("PATH"); 26PathOrigin = getenv("PATH");
27if MSDOS then 27if getos() == 'Windows' then
28for i = 1 : size(tab_ref,'*') 28for i = 1 : size(tab_ref,'*')
29 sz = "dir_" + tab_ref(i); 29 sz = "dir_" + tab_ref(i);
30 a = chdir(sz); 30 a = chdir(sz);
diff --git a/scilab/modules/io/tests/unit_tests/searchenv.encoding.tst b/scilab/modules/io/tests/unit_tests/searchenv.encoding.tst
index da3025e..c79444a 100644
--- a/scilab/modules/io/tests/unit_tests/searchenv.encoding.tst
+++ b/scilab/modules/io/tests/unit_tests/searchenv.encoding.tst
@@ -12,7 +12,7 @@ mydir = TMPDIR + filesep() + "loadlib";
12createdir(mydir); 12createdir(mydir);
13chdir(mydir); 13chdir(mydir);
14 14
15if MSDOS then 15if getos() == 'Windows' then
16 unix_w(jre_path()+"\bin\java.exe -cp "+SCI+"\modules\localization\tests\unit_tests CreateDir"); 16 unix_w(jre_path()+"\bin\java.exe -cp "+SCI+"\modules\localization\tests\unit_tests CreateDir");
17else 17else
18 unix_w(jre_path()+"/bin/java -classpath "+SCI+"/modules/localization/tests/unit_tests CreateDir"); 18 unix_w(jre_path()+"/bin/java -classpath "+SCI+"/modules/localization/tests/unit_tests CreateDir");
@@ -34,7 +34,7 @@ tab_ref = [
34 34
35PathOrigin = getenv("PATH"); 35PathOrigin = getenv("PATH");
36 36
37if MSDOS then 37if getos() == 'Windows' then
38 38
39for i = 1 : size(tab_ref,'*') 39for i = 1 : size(tab_ref,'*')
40 sz = "dir_" + tab_ref(i); 40 sz = "dir_" + tab_ref(i);