From 5434c1b540afd7e2be8ae3fb1f77bce70eb6c54c Mon Sep 17 00:00:00 2001
From: hidnplayr <hidnplayr@kolibrios.org>
Date: Thu, 19 Jan 2017 17:48:18 +0000
Subject: [PATCH] Remove duplicate libio.inc

git-svn-id: svn://kolibrios.org@6835 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/libio.inc             | 113 ---------------------------------
 programs/network/ftpc/ftpc.asm |   4 +-
 programs/network/ftpd/ftpd.asm |   4 +-
 3 files changed, 4 insertions(+), 117 deletions(-)
 delete mode 100644 programs/libio.inc

diff --git a/programs/libio.inc b/programs/libio.inc
deleted file mode 100644
index 220203b24f..0000000000
--- a/programs/libio.inc
+++ /dev/null
@@ -1,113 +0,0 @@
-;;================================================================================================;;
-;;//// libio.inc //// (c) mike.dld, 2007-2008 ////////////////////////////////////////////////////;;
-;;================================================================================================;;
-;;                                                                                                ;;
-;; This file is part of Common development libraries (Libs-Dev).                                  ;;
-;;                                                                                                ;;
-;; Libs-Dev is free software: you can redistribute it and/or modify it under the terms of the GNU ;;
-;; Lesser General Public License as published by the Free Software Foundation, either version 2.1 ;;
-;; of the License, or (at your option) any later version.                                         ;;
-;;                                                                                                ;;
-;; Libs-Dev 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  ;;
-;; Lesser General Public License for more details.                                                ;;
-;;                                                                                                ;;
-;; You should have received a copy of the GNU Lesser General Public License along with Libs-Dev.  ;;
-;; If not, see <http://www.gnu.org/licenses/>.                                                    ;;
-;;                                                                                                ;;
-;;================================================================================================;;
-
-
-O_BINARY = 00000000b
-O_READ   = 00000001b
-O_WRITE  = 00000010b
-O_CREATE = 00000100b
-O_SHARE  = 00001000b
-O_TEXT   = 00010000b
-
-SEEK_SET = 0
-SEEK_CUR = 1
-SEEK_END = 2
-
-struct FileDateTime
-  union
-    time    dd ?
-    struct
-      sec   db ?
-      min   db ?
-      hour  db ?
-    ends
-  ends
-  union
-    date    dd ?
-    struct
-      day   db ?
-      month db ?
-      year  dw ?
-    ends
-  ends
-ends
-
-struct FileInfoBlock
-  Function   dd ?
-  Position   dd ?
-  Flags      dd ?
-  Count      dd ?
-  Buffer     dd ?
-             db ?
-  FileName   dd ?
-ends
-
-struct FileInfoHeader
-  Version    dd ?
-  FilesRead  dd ?
-  FilesCount dd ?
-             rd 5
-ends
-
-struct FileInfoA
-  Attributes   dd ?
-  Flags        dd ?
-  DateCreate   FileDateTime
-  DateAccess   FileDateTime
-  DateModify   FileDateTime
-  union
-    FileSize   dq ?
-    struct
-      FileSizeLow  dd ?
-      FileSizeHigh dd ?
-    ends
-  ends
-  FileName     rb 264
-ends
-
-struct FileInfoW
-  Attributes   dd ?
-  Flags        dd ?
-  DateCreate   FileDateTime
-  DateAccess   FileDateTime
-  DateModify   FileDateTime
-  union
-    FileSize   dq ?
-    struct
-      FileSizeLow  dd ?
-      FileSizeHigh dd ?
-    ends
-  ends
-  FileName     rw 264
-ends
-
-virtual at 0
-         FileInfo            FileInfoA
-         FileInfo fix        FileInfoA
-  sizeof.FileInfo fix sizeof.FileInfoA
-end virtual
-
-FA_READONLY = 00000001b
-FA_HIDDEN   = 00000010b
-FA_SYSTEM   = 00000100b
-FA_LABEL    = 00001000b
-FA_FOLDER   = 00010000b
-FA_ARCHIVED = 00100000b
-FA_NORMAL   = 01000000b
-FA_ANY      = 01111111b
diff --git a/programs/network/ftpc/ftpc.asm b/programs/network/ftpc/ftpc.asm
index d2fc31c970..8fbfd9cda7 100644
--- a/programs/network/ftpc/ftpc.asm
+++ b/programs/network/ftpc/ftpc.asm
@@ -86,8 +86,8 @@ start: ;////////////////////////////////////////////////////////////////////////
 ;< none                                                                                           ;;
 ;;================================================================================================;;
 ; initialize heap for using dynamic blocks
-        mcall   68,11
-        test    eax,eax
+        mcall   68, 11
+        test    eax, eax
         je      exit2
         
 ; disable all events except network event
diff --git a/programs/network/ftpd/ftpd.asm b/programs/network/ftpd/ftpd.asm
index 2f223bd095..3eef7f2ad4 100644
--- a/programs/network/ftpd/ftpd.asm
+++ b/programs/network/ftpd/ftpd.asm
@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                                 ;;
-;; Copyright (C) KolibriOS team 2010-2013. All rights reserved.    ;;
+;; Copyright (C) KolibriOS team 2010-2017. All rights reserved.    ;;
 ;; Distributed under terms of the GNU General Public License       ;;
 ;;                                                                 ;;
 ;;  ftpd.asm - FTP Daemon for KolibriOS                            ;;
@@ -68,7 +68,7 @@ purge mov,add,sub
 include '../../proc32.inc'
 include '../../dll.inc'
 include '../../struct.inc'
-include '../../libio.inc'
+include '../../develop/libraries/libs-dev/libio/libio.inc'
 
 include '../../network.inc'