tristan/ZealOS
1
0
Fork 0
mirror of https://github.com/Zeal-Operating-System/ZealOS.git synced 2024-12-25 23:10:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Gopher client null host bug.

Browse source 
Update README to link to ISO build guide.
This commit is contained in:
TomAwezome 2021-11-02 17:32:47 -04:00
parent 9ac4b35c29
commit 5a4bccc5b9
5 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -32,7 +32,7 @@ Features in development include:
- For running in a VM: Intel VT-x/AMD-V acceleration enabled in your BIOS settings. (Required to virtualize any 64-bit operating system properly.) - For running in a VM: Intel VT-x/AMD-V acceleration enabled in your BIOS settings. (Required to virtualize any 64-bit operating system properly.)
- Working knowledge of the C programming language. - Working knowledge of the C programming language.
To create a Distro ISO, run `build_iso.sh` in the `build/` directory. After creating an ISO, see the Wiki for guides on installing in [VirtualBox](https://github.com/Zeal-Operating-System/ZealOS/wiki/Installing-(Virtualbox)), [VMWare](https://github.com/Zeal-Operating-System/ZealOS/wiki/Installing-(VMWare)), and [bare-metal](https://github.com/Zeal-Operating-System/ZealOS/wiki/Installing-(Bare%E2%80%90metal)). To create a Distro ISO, run `build_iso.sh` in the `build/` directory. Check the Wiki guide for details on [building an ISO](https://github.com/Zeal-Operating-System/ZealOS/wiki/Building-an-ISO). After creating an ISO, see the Wiki guides on installing in [VirtualBox](https://github.com/Zeal-Operating-System/ZealOS/wiki/Installing-(Virtualbox)), [VMWare](https://github.com/Zeal-Operating-System/ZealOS/wiki/Installing-(VMWare)), and [bare-metal](https://github.com/Zeal-Operating-System/ZealOS/wiki/Installing-(Bare%E2%80%90metal)).
### Contributing ### Contributing

18
src/Home/Net/Programs/Gopher.CC
View file

@ -22,7 +22,7 @@ I64 GopherOpen(U8* host, U16 port, U8* selector, U8* query)
// sock = create_connection(host, port); // sock = create_connection(host, port);
sock = TCPConnectionCreate(host, port); sock = TCPConnectionCreate(host, port);
if (sock < 0) if (sock <= 0)
{ {
PrintErr("Failed to connect to %s:%d\n", host, port); PrintErr("Failed to connect to %s:%d\n", host, port);
return sock; return sock;
@ -36,7 +36,10 @@ I64 GopherOpen(U8* host, U16 port, U8* selector, U8* query)
{ {
line = StrPrint(NULL, "%s\t%s\r\n", selector, query); line = StrPrint(NULL, "%s\t%s\r\n", selector, query);
} }
sock(CTCPSocket *)->timeout = TCP_TIMEOUT*5;
// sendString(sock, line, 0); // sendString(sock, line, 0);
TCPSocketSendString(sock, line); TCPSocketSendString(sock, line);
Free(line); Free(line);
@ -197,7 +200,10 @@ U0 GopherLine(U8* line)
line++; line++;
port = Str2I64(line); port = Str2I64(line);
} }
if (!*host)
return;
switch (type) switch (type)
{ {
case '3': case '3':
@ -224,7 +230,7 @@ public I64 GopherMenu
U8 buf[256]; U8 buf[256];
sock = GopherOpen(host, port, selector, query); sock = GopherOpen(host, port, selector, query);
if (sock < 0) if (sock <= 0)
{ {
return sock; return sock;
} }
@ -286,5 +292,5 @@ gopher_associations['1'] = "GopherMenu";
gopher_associations['7'] = "GopherQueryPrompt"; gopher_associations['7'] = "GopherQueryPrompt";
/* Include this file from your HomeSys, then add more associations */ /* Include this file from your HomeSys, then add more associations */
"\n\nTry using GopherMenu to connect to a gopher server," "\n\nTry using GopherMenu to connect to a gopher server, for example:\n\n"
"for example: GopherMenu(\"gopher.floodgap.com\");\n\n"; " $FG,2$GopherMenu(\"gopher.floodgap.com\");$FG$\n\n";

2
src/Kernel/BlkDev/DiskClus.CC
View file

@ -76,7 +76,7 @@ I64 ClusBlkRead(CDrive *drive, U8 *buf, I64 c, I64 blks)
if (i > drive->spc) if (i > drive->spc)
i = drive->spc; i = drive->spc;
BlkRead(drive, buf, drive->data_area + c * drive->spc, i); BlkRead(drive, buf, drive->data_area + c * drive->spc, i);
buf+=i << BLK_SIZE_BITS; buf += i << BLK_SIZE_BITS;
c = ClusNumNext(drive, c, 1); c = ClusNumNext(drive, c, 1);
blks -= i; blks -= i;
} }

2
src/Kernel/KDebug.CC
View file

@ -725,7 +725,7 @@ U0 Fault2(I64 fault_num, I64 fault_err_code)
"Task \""; "Task \"";
"%s", Fs->task_title; "%s", Fs->task_title;
"\"\n"; "\"\n\n";
"Fault: 0x%02X %Z\n", fault_num, fault_num, "ST_INT_NAMES"; "Fault: 0x%02X %Z\n", fault_num, fault_num, "ST_INT_NAMES";
"Err Code: %08X\n", fault_err_code; "Err Code: %08X\n", fault_err_code;
was_in_debug = DebugMode(ON); was_in_debug = DebugMode(ON);

2
src/System/Define.CC
View file

@ -15,7 +15,7 @@ U0 LoadDocDefines()
//$LK,"DD_BOOT_HIGH_LOC_DVD",A="FF:::/System/Boot/BootDVD.CC,DD_BOOT_HIGH_LOC_DVD"$ //$LK,"DD_BOOT_HIGH_LOC_DVD",A="FF:::/System/Boot/BootDVD.CC,DD_BOOT_HIGH_LOC_DVD"$
$TR,"LineRep"$ $TR,"LineRep"$
$ID,2$DefinePrint("DD_ZEALOS_LOC","95,262"); $ID,2$DefinePrint("DD_ZEALOS_LOC","95,264");
$ID,-2$ $ID,-2$
DefinePrint("DD_MP_VECT", "%08X", MP_VECT_ADDR); DefinePrint("DD_MP_VECT", "%08X", MP_VECT_ADDR);
DefinePrint("DD_MP_VECT_END", "%08X", MP_VECT_ADDR + COREAP_16BIT_INIT_END - COREAP_16BIT_INIT - 1); DefinePrint("DD_MP_VECT_END", "%08X", MP_VECT_ADDR + COREAP_16BIT_INIT_END - COREAP_16BIT_INIT - 1);