From abf68aa9eaae7f71741cec6d04cb2e6d8b45bce6 Mon Sep 17 00:00:00 2001
From: Stanislav KROTER <krotersv@gmail.com>
Date: Tue, 31 Jul 2012 22:17:02 +0600
Subject: [PATCH] mkdir Fix some messages

Revision of help page.

Change-Id: Ibfcf378bb2749f1a1fbd7cf413e5eaf15ebf7c3f
---
 scilab/modules/fileio/help/en_US/mkdir.xml |  112 +++++++++++++++++++++++-----
 scilab/modules/fileio/macros/mkdir.sci     |    6 +-
 2 files changed, 99 insertions(+), 19 deletions(-)

diff --git a/scilab/modules/fileio/help/en_US/mkdir.xml b/scilab/modules/fileio/help/en_US/mkdir.xml
index a06d78e..ddcc463 100644
--- a/scilab/modules/fileio/help/en_US/mkdir.xml
+++ b/scilab/modules/fileio/help/en_US/mkdir.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="windows-1251"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - INRIA - Allan CORNET
@@ -14,35 +14,113 @@
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:id="mkdir" xml:lang="en">
     <refnamediv>
         <refname>mkdir</refname>
-        <refpurpose>Make new directory</refpurpose>
+        <refpurpose>makes a new directory</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Calling Sequence</title>
         <synopsis>
-            mkdir('dirname')
-            mkdir('parentdir','newdir')
-            status=mkdir( ... )
-            [status,msg]=mkdir( ... )
+            mkdir(dirname)
+            mkdir(parentdir, dirname)
+            status = mkdir( ... )
+            [status, msg] = mkdir( ... )
         </synopsis>
     </refsynopsisdiv>
     <refsection>
+        <title>Arguments</title>
+        <variablelist>
+            <varlistentry>
+                <term>dirname</term>
+                <listitem>
+                    <para>
+                        a character string: a directory to create.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>parentdir</term>
+                <listitem>
+                    <para>
+                        a character string: a directory in which the new directory <varname>dirname</varname> will be created.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>status</term>
+                <listitem>
+                    <para>
+                        an integer: the status of the operation.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>msg</term>
+                <listitem>
+                    <para>
+                        a character string: a message about an error.
+                    </para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
+    <refsection>
         <title>Description</title>
         <para>
-            <literal>mkdir('dirname')</literal> creates the directory <literal>dirname</literal> in the current
-            directory, if <literal>dirname</literal> represents a relative path. Otherwise, <literal>dirname</literal>
-            represents an absolute path and mkdir attempts to create the absolute
-            directory <literal>dirname</literal>
+            <code>mkdir(dirname)</code> creates the directory <varname>dirname</varname> in the current directory, if <varname>dirname</varname> represents a relative path. Otherwise, <varname>dirname</varname> represents an absolute path and <function>mkdir</function> attempts to create the absolute directory <varname>dirname</varname>.
         </para>
         <para>
-            <literal>mkdir('parentdir', 'dirname')</literal> creates the directory <literal>dirname</literal> in the
-            existing directory <literal>parentdir</literal>, where <literal>parentdir</literal> is an absolute or relative
-            pathname.
+            <code>mkdir(parentdir, dirname)</code> creates the directory <varname>dirname</varname> in the directory <varname>parentdir</varname> (if <varname>parentdir</varname> is not existing it will be created), where <varname>parentdir</varname> is an absolute or relative pathname.
         </para>
         <para>
-            <literal>[status,message] = mkdir(parentdir, 'dirname')</literal> creates the directory
-            <literal>dirname</literal> in the existing directory <literal>parentdir</literal>, returning the status, a
-            message. Here, status is 1 for success, 2 if it already exists, -2 if it
-            is a filename and 0 otherwise.
+            <code>[status,msg] = mkdir(parentdir, dirname)</code> creates the directory <varname>dirname</varname> in the existing directory <varname>parentdir</varname>, returning the status and the message about an error. 
+        </para>
+        <para>   
+            <informaltable frame='all'>
+                <tr>
+                    <td>
+                        <varname>status</varname>
+                    </td>
+                    <td>
+                        <varname>msg</varname>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        -2
+                    </td>
+                    <td>
+                        mkdir: An error occurred: A file with the same name already exists in dirname
+                        
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        0
+                    </td>
+                    <td>
+                        mkdir: An error occurred: Impossible to create directory dirname
+                        
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        1
+                    </td>
+                    
+                    <td>
+                        Success
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        2
+                    </td>
+                    <td>
+                        mkdir: An error occurred: This directory already exists in dirname
+                        
+                    </td>
+                </tr>
+            </informaltable>
+            	
         </para>
     </refsection>
     <refsection>
diff --git a/scilab/modules/fileio/macros/mkdir.sci b/scilab/modules/fileio/macros/mkdir.sci
index 34145c8..c99ec6e 100644
--- a/scilab/modules/fileio/macros/mkdir.sci
+++ b/scilab/modules/fileio/macros/mkdir.sci
@@ -56,7 +56,7 @@ function [status, msg]=mkdir(varargin)
 
     NewDirName   = varargin(2);
     if type(NewDirName) <> 10 then
-      error(999, msprintf(gettext("%s: Wrong type for input argument #%d: String expected.\n"), "mkdir", 2));
+      error(999, msprintf(gettext("%s: Wrong type for input argument #%d: A string expected.\n"), "mkdir", 2));
     end
 
     if size(NewDirName, "*") <> 1 then
@@ -107,7 +107,9 @@ function [status, msg]=mkdir(varargin)
       end
       if ~isfile(currentsubdir) & ~isdir(currentsubdir) then
         status = createdir(currentsubdir);
-        if ~status then break, end
+        if ~status then 
+            break 
+        end
       end
     end
 
-- 
1.7.9.5