From 7c0f7e203af04e1fd74073c308502c93a19bb2bd Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Tue, 23 Aug 2011 21:25:49 +0000 Subject: [PATCH] httpc deleted from distro, /sys/downloader -> /sys/network/downloader, menu updated git-svn-id: svn://kolibrios.org@2109 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Vortex86MX-eng/Makefile | 3 +-- data/Vortex86MX-eng/menu.dat | 4 ++-- data/eng/Makefile | 3 +-- data/eng/menu.dat | 4 ++-- data/rus/Makefile | 3 +-- data/rus/menu.dat | 4 ++-- programs/network/htmlv/browser/TWB.h-- | 2 +- 7 files changed, 10 insertions(+), 13 deletions(-) diff --git a/data/Vortex86MX-eng/Makefile b/data/Vortex86MX-eng/Makefile index 323252c178..21b2ed5cb4 100644 --- a/data/Vortex86MX-eng/Makefile +++ b/data/Vortex86MX-eng/Makefile @@ -54,7 +54,6 @@ FASM_PROGRAMS:=\ desktop:DESKTOP:$(PROGS)/system/desktop/trunk/desktop.asm \ disptest:DISPTEST:$(PROGS)/system/disptest/trunk/disptest.ASM \ docpak:DOCPAK:$(PROGS)/system/docpack/trunk/docpack.asm \ - downloader:downloader:$(PROGS)/network/downloader/trunk/downloader.asm \ end:END:$(PROGS)/system/end/light/end.asm \ gmon:GMON:$(PROGS)/system/gmon/gmon.asm \ hdd_info:HDD_INFO:$(PROGS)/system/hdd_info/trunk/hdd_info.asm \ @@ -169,9 +168,9 @@ FASM_PROGRAMS:=\ network/airc:NETWORK/AIRC:$(PROGS)/network/airc/trunk/airc.asm \ network/arpstat:NETWORK/ARPSTAT:$(PROGS)/network/arpstat/trunk/arpstat.asm \ network/chess:NETWORK/CHESS:$(PROGS)/network/chess/trunk/chess.asm \ + network/downloader:NETWORK/DOWNLOADER:$(PROGS)/network/downloader/trunk/downloader.asm \ network/ethstat:NETWORK/ETHSTAT:$(PROGS)/network/ethstat/trunk/ethstat.asm \ network/ftps:NETWORK/FTPS:$(PROGS)/network/ftps/trunk/FTPS.ASM \ - network/httpc:NETWORK/HTTPC:$(PROGS)/network/httpc/trunk/httpc.asm \ network/https:NETWORK/HTTPS:$(PROGS)/network/https/trunk/https.asm \ network/nntpc:NETWORK/NNTPC:$(PROGS)/network/nntpc/trunk/nntpc.asm \ network/nslookup:NETWORK/NSLOOKUP:$(PROGS)/develop/libraries/network/examples/nslookup.asm \ diff --git a/data/Vortex86MX-eng/menu.dat b/data/Vortex86MX-eng/menu.dat index c40130492e..bdce647433 100644 --- a/data/Vortex86MX-eng/menu.dat +++ b/data/Vortex86MX-eng/menu.dat @@ -141,8 +141,8 @@ FTPS /rd/1/network/ftps #17 **** CLIENTS **** TFTP client /rd/1/network/tftpc Internet-chess /rd/1/network/chess -Simple HTTP client /rd/1/network/httpc -HTML+HTTP viewer /rd/1/htmlv +Internet downloader /rd/1/network/downloader +Text-based browser /rd/1/htmlv NNTP-NewsGroups /rd/1/network/nntpc TELNET /rd/1/network/telnet POP - MAIL /rd/1/network/popc diff --git a/data/eng/Makefile b/data/eng/Makefile index a6ad93466c..83ef3c699d 100644 --- a/data/eng/Makefile +++ b/data/eng/Makefile @@ -54,7 +54,6 @@ FASM_PROGRAMS:=\ desktop:DESKTOP:$(PROGS)/system/desktop/trunk/desktop.asm \ disptest:DISPTEST:$(PROGS)/system/disptest/trunk/disptest.ASM \ docpak:DOCPAK:$(PROGS)/system/docpack/trunk/docpack.asm \ - downloader:downloader:$(PROGS)/network/downloader/trunk/downloader.asm \ end:END:$(PROGS)/system/end/light/end.asm \ gmon:GMON:$(PROGS)/system/gmon/gmon.asm \ hdd_info:HDD_INFO:$(PROGS)/system/hdd_info/trunk/hdd_info.asm \ @@ -170,9 +169,9 @@ FASM_PROGRAMS:=\ network/airc:NETWORK/AIRC:$(PROGS)/network/airc/trunk/airc.asm \ network/arpstat:NETWORK/ARPSTAT:$(PROGS)/network/arpstat/trunk/arpstat.asm \ network/chess:NETWORK/CHESS:$(PROGS)/network/chess/trunk/chess.asm \ + network/downloader:NETWORK/DOWNLOADER:$(PROGS)/network/downloader/trunk/downloader.asm \ network/ethstat:NETWORK/ETHSTAT:$(PROGS)/network/ethstat/trunk/ethstat.asm \ network/ftps:NETWORK/FTPS:$(PROGS)/network/ftps/trunk/FTPS.ASM \ - network/httpc:NETWORK/HTTPC:$(PROGS)/network/httpc/trunk/httpc.asm \ network/https:NETWORK/HTTPS:$(PROGS)/network/https/trunk/https.asm \ network/nntpc:NETWORK/NNTPC:$(PROGS)/network/nntpc/trunk/nntpc.asm \ network/nslookup:NETWORK/NSLOOKUP:$(PROGS)/develop/libraries/network/examples/nslookup.asm \ diff --git a/data/eng/menu.dat b/data/eng/menu.dat index c40130492e..bdce647433 100644 --- a/data/eng/menu.dat +++ b/data/eng/menu.dat @@ -141,8 +141,8 @@ FTPS /rd/1/network/ftps #17 **** CLIENTS **** TFTP client /rd/1/network/tftpc Internet-chess /rd/1/network/chess -Simple HTTP client /rd/1/network/httpc -HTML+HTTP viewer /rd/1/htmlv +Internet downloader /rd/1/network/downloader +Text-based browser /rd/1/htmlv NNTP-NewsGroups /rd/1/network/nntpc TELNET /rd/1/network/telnet POP - MAIL /rd/1/network/popc diff --git a/data/rus/Makefile b/data/rus/Makefile index f70e40c5e5..b919d8a612 100644 --- a/data/rus/Makefile +++ b/data/rus/Makefile @@ -54,7 +54,6 @@ FASM_PROGRAMS:=\ desktop:DESKTOP:$(PROGS)/system/desktop/trunk/desktop.asm \ disptest:DISPTEST:$(PROGS)/system/disptest/trunk/disptest.ASM \ docpak:DOCPAK:$(PROGS)/system/docpack/trunk/docpack.asm \ - downloader:downloader:$(PROGS)/network/downloader/trunk/downloader.asm \ end:END:$(PROGS)/system/end/light/end.asm \ gmon:GMON:$(PROGS)/system/gmon/gmon.asm \ hdd_info:HDD_INFO:$(PROGS)/system/hdd_info/trunk/hdd_info.asm \ @@ -169,9 +168,9 @@ FASM_PROGRAMS:=\ network/airc:NETWORK/AIRC:$(PROGS)/network/airc/trunk/airc.asm \ network/arpstat:NETWORK/ARPSTAT:$(PROGS)/network/arpstat/trunk/arpstat.asm \ network/chess:NETWORK/CHESS:$(PROGS)/network/chess/trunk/chess.asm \ + network/downloader:NETWORK/DOWNLOADER:$(PROGS)/network/downloader/trunk/downloader.asm \ network/ethstat:NETWORK/ETHSTAT:$(PROGS)/network/ethstat/trunk/ethstat.asm \ network/ftps:NETWORK/FTPS:$(PROGS)/network/ftps/trunk/FTPS.ASM \ - network/httpc:NETWORK/HTTPC:$(PROGS)/network/httpc/trunk/httpc.asm \ network/https:NETWORK/HTTPS:$(PROGS)/network/https/trunk/https.asm \ network/nntpc:NETWORK/NNTPC:$(PROGS)/network/nntpc/trunk/nntpc.asm \ network/nslookup:NETWORK/NSLOOKUP:$(PROGS)/develop/libraries/network/examples/nslookup.asm \ diff --git a/data/rus/menu.dat b/data/rus/menu.dat index c86227de97..e99217c495 100644 --- a/data/rus/menu.dat +++ b/data/rus/menu.dat @@ -144,8 +144,8 @@ FTPS /rd/1/network/ftps #17 **** CLIENTS **** TFTP-клиент /rd/1/network/tftpc Интернет-шахматы /rd/1/network/chess -Простой HTTP-клиент /rd/1/network/httpc -Просмотр HTML+HTTP /rd/1/htmlv +Загрузчик из интернета /rd/1/network/downloader +Текстовый браузер HTMLv /rd/1/htmlv NNTP-группы новостей /rd/1/network/nntpc TELNET /rd/1/network/telnet POP-почта /rd/1/network/popc diff --git a/programs/network/htmlv/browser/TWB.h-- b/programs/network/htmlv/browser/TWB.h-- index f4fd86484a..6db88a8878 100644 --- a/programs/network/htmlv/browser/TWB.h-- +++ b/programs/network/htmlv/browser/TWB.h-- @@ -183,7 +183,7 @@ void ReadHtml(byte DO_LOAD) { { DeleteFile(#download_path); IF (URL[strlen(#URL)-1]=='/') URL[strlen(#URL)-1]=''; - RunProgram("/sys/downloader", #URL); + RunProgram("/sys/network/downloader", #URL); RETURN; } ReadFile(0, 1048576, buf, #download_path);