forked from KolibriOS/kolibrios
Fix EN typos
- Corrections for en_US language. - Some whitespace sanitation. git-svn-id: svn://kolibrios.org@10061 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
parent
4ad795c835
commit
2d3e0ac7f4
@ -4,7 +4,7 @@ struct thread_data
|
|||||||
rb 1024
|
rb 1024
|
||||||
stack rb 0
|
stack rb 0
|
||||||
|
|
||||||
home_dir rb 1024 ; home directory in wich the user is locked, asciiz
|
home_dir rb 1024 ; home directory in which the user is locked, asciiz
|
||||||
work_dir rb 1024 ; working directory, must at all times begin and end with a '/', asciiz
|
work_dir rb 1024 ; working directory, must at all times begin and end with a '/', asciiz
|
||||||
fpath rb 1024*3 ; file path, combination of home_dir, work_dir and filename
|
fpath rb 1024*3 ; file path, combination of home_dir, work_dir and filename
|
||||||
; Will also be used to temporarily store username
|
; Will also be used to temporarily store username
|
||||||
@ -27,7 +27,7 @@ ends
|
|||||||
;------------------------------------------------
|
;------------------------------------------------
|
||||||
; parse_cmd
|
; parse_cmd
|
||||||
;
|
;
|
||||||
; Internal function wich uses the 'commands'
|
; Internal function which uses the 'commands'
|
||||||
; table to call an appropriate cmd_xx function.
|
; table to call an appropriate cmd_xx function.
|
||||||
;
|
;
|
||||||
; input: esi = ptr to ascii commands
|
; input: esi = ptr to ascii commands
|
||||||
@ -305,7 +305,7 @@ open_datasock:
|
|||||||
add esp, 4
|
add esp, 4
|
||||||
jmp socketerror
|
jmp socketerror
|
||||||
|
|
||||||
; If we are still in passive_wait, it's time we accept an incomming call..
|
; If we are still in passive_wait, it's time we accept an incoming call...
|
||||||
.not_active:
|
.not_active:
|
||||||
cmp [ebp + thread_data.mode], MODE_PASSIVE_WAIT
|
cmp [ebp + thread_data.mode], MODE_PASSIVE_WAIT
|
||||||
jne .socketerror
|
jne .socketerror
|
||||||
@ -358,7 +358,7 @@ cmdCDUP:
|
|||||||
jz permission_denied
|
jz permission_denied
|
||||||
|
|
||||||
cmp byte [ebp + thread_data.work_dir+1], 0 ; are we in "/" ?
|
cmp byte [ebp + thread_data.work_dir+1], 0 ; are we in "/" ?
|
||||||
je .done ; if so, we cant go up..
|
je .done ; if so, we can't go up.
|
||||||
|
|
||||||
; find the end of asciiz string work_dir
|
; find the end of asciiz string work_dir
|
||||||
mov ecx, 1024
|
mov ecx, 1024
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
;; ;;
|
;; ;;
|
||||||
;; Copyright (C) KolibriOS team 2010-2017. All rights reserved. ;;
|
;; Copyright (C) KolibriOS team 2010-2024. All rights reserved. ;;
|
||||||
;; Distributed under terms of the GNU General Public License ;;
|
;; Distributed under terms of the GNU General Public License ;;
|
||||||
;; ;;
|
;; ;;
|
||||||
;; ftpd.asm - FTP Daemon for KolibriOS ;;
|
;; ftpd.asm - FTP Daemon for KolibriOS ;;
|
||||||
@ -139,7 +139,7 @@ start:
|
|||||||
add esp, 8
|
add esp, 8
|
||||||
|
|
||||||
; open listening socket
|
; open listening socket
|
||||||
mcall socket, AF_INET4, SOCK_STREAM, SO_NONBLOCK ; we dont want to block on accept
|
mcall socket, AF_INET4, SOCK_STREAM, SO_NONBLOCK ; we don't want to block on accept
|
||||||
cmp eax, -1
|
cmp eax, -1
|
||||||
je sock_err
|
je sock_err
|
||||||
mov [socketnum], eax
|
mov [socketnum], eax
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
;; ;;
|
;; ;;
|
||||||
;; Copyright (C) KolibriOS team 2004-2020. All rights reserved. ;;
|
;; Copyright (C) KolibriOS team 2004-2024. All rights reserved. ;;
|
||||||
;; Distributed under terms of the GNU General Public License ;;
|
;; Distributed under terms of the GNU General Public License ;;
|
||||||
;; ;;
|
;; ;;
|
||||||
;; Written by hidnplayr@kolibrios.org ;;
|
;; Written by hidnplayr@kolibrios.org ;;
|
||||||
@ -176,7 +176,7 @@ draw_user_list:
|
|||||||
; OK, draw the scrollbar
|
; OK, draw the scrollbar
|
||||||
invoke scrollbar_draw, scroll1
|
invoke scrollbar_draw, scroll1
|
||||||
|
|
||||||
; dont redraw scrollbar completely next time,
|
; don't redraw scrollbar completely next time,
|
||||||
; unless draw_window asks us to by setting [scroll1.all_redraw] back to 1
|
; unless draw_window asks us to by setting [scroll1.all_redraw] back to 1
|
||||||
mov [scroll1.all_redraw], 0
|
mov [scroll1.all_redraw], 0
|
||||||
jmp .scroll_done
|
jmp .scroll_done
|
||||||
@ -292,7 +292,7 @@ draw_window_tabs:
|
|||||||
|
|
||||||
; Draw the close window button
|
; Draw the close window button
|
||||||
mov edi, [window_active]
|
mov edi, [window_active]
|
||||||
cmp [edi + window.type], WINDOWTYPE_SERVER ; dont let the user close server window
|
cmp [edi + window.type], WINDOWTYPE_SERVER ; don't let the user close server window
|
||||||
je @f
|
je @f
|
||||||
|
|
||||||
; mov eax, 8
|
; mov eax, 8
|
||||||
|
@ -96,7 +96,7 @@ user_parser:
|
|||||||
.ret:
|
.ret:
|
||||||
ret
|
ret
|
||||||
|
|
||||||
; Text begins with a '/' lets try to find the command in the lookup table.
|
; Text begins with a '/' let's try to find the command in the lookup table.
|
||||||
.command:
|
.command:
|
||||||
mov eax, dword[user_command+1] ; skip '/'
|
mov eax, dword[user_command+1] ; skip '/'
|
||||||
or eax, 0x20202020 ; convert to lowercase
|
or eax, 0x20202020 ; convert to lowercase
|
||||||
@ -309,7 +309,7 @@ cmd_usr_nick:
|
|||||||
.fail:
|
.fail:
|
||||||
ret
|
ret
|
||||||
|
|
||||||
; We arent logged in yet, directly change user_nick field and print notification to user.
|
; We aren't logged in yet, directly change user_nick field and print notification to user.
|
||||||
.dontsend:
|
.dontsend:
|
||||||
mov ecx, MAX_NICK_LEN
|
mov ecx, MAX_NICK_LEN
|
||||||
mov esi, user_command+6
|
mov esi, user_command+6
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
;; ;;
|
;; ;;
|
||||||
;; Copyright (C) KolibriOS team 2010-2015. All rights reserved. ;;
|
;; Copyright (C) KolibriOS team 2010-2024. All rights reserved. ;;
|
||||||
;; Distributed under terms of the GNU General Public License ;;
|
;; Distributed under terms of the GNU General Public License ;;
|
||||||
;; ;;
|
;; ;;
|
||||||
;; VNC client for KolibriOS ;;
|
;; VNC client for KolibriOS ;;
|
||||||
@ -24,7 +24,7 @@ thread_start:
|
|||||||
jz .port_done
|
jz .port_done
|
||||||
cmp al, ':'
|
cmp al, ':'
|
||||||
jne @r
|
jne @r
|
||||||
mov byte[esi-1], 0 ; replace colon with 0 byte, we dont want to upset getaddrinfo
|
mov byte[esi-1], 0 ; replace colon with 0 byte, we don't want to upset getaddrinfo
|
||||||
xor eax, eax
|
xor eax, eax
|
||||||
xor ebx, ebx ; port number
|
xor ebx, ebx ; port number
|
||||||
@@:
|
@@:
|
||||||
|
@ -106,11 +106,11 @@ int get_whois_data(char *domain , char **data)
|
|||||||
// Next line please
|
// Next line please
|
||||||
pch = strtok(NULL , "\n");
|
pch = strtok(NULL , "\n");
|
||||||
}
|
}
|
||||||
// Now we have the TLD whois server in wch , query again
|
// Now we have the TLD whois server in 'wch', query again
|
||||||
//This will provide minimal whois information along with the parent whois server of the specific domain :)
|
// This will provide minimal whois information along with the parent whois server of the specific domain :)
|
||||||
wch = strdup(wch);
|
wch = strdup(wch);
|
||||||
free(response);
|
free(response);
|
||||||
//This should not be necessary , but segmentation fault without this , why ?
|
// This should not be necessary, but segmentation fault without this, why ?
|
||||||
response = NULL;
|
response = NULL;
|
||||||
if(wch != NULL){
|
if(wch != NULL){
|
||||||
fprintf(out,"\nTLD Whois server is : %s" , wch);
|
fprintf(out,"\nTLD Whois server is : %s" , wch);
|
||||||
@ -141,8 +141,8 @@ int get_whois_data(char *domain , char **data)
|
|||||||
If a registrar whois server is found then query it
|
If a registrar whois server is found then query it
|
||||||
*/
|
*/
|
||||||
if(wch){
|
if(wch){
|
||||||
// Now we have the registrar whois server , this has the direct full information of the particular domain
|
// Now we have the registrar whois server, this has the direct full information of the particular domain
|
||||||
// so lets query again
|
// so let's query again
|
||||||
|
|
||||||
fprintf(out, "\nRegistrar Whois server is : %s" , wch);
|
fprintf(out, "\nRegistrar Whois server is : %s" , wch);
|
||||||
|
|
||||||
@ -231,7 +231,7 @@ int hostname_to_ip(char *hostname , char *ip)
|
|||||||
char port_str[16]; sprintf(port_str, "%d", 80);
|
char port_str[16]; sprintf(port_str, "%d", 80);
|
||||||
struct addrinfo hints;
|
struct addrinfo hints;
|
||||||
memset(&hints, 0, sizeof(hints));
|
memset(&hints, 0, sizeof(hints));
|
||||||
hints.ai_family = AF_UNSPEC; // IPv4 or IPv6 doesnt matter
|
hints.ai_family = AF_UNSPEC; // IPv4 or IPv6 doesn't matter
|
||||||
hints.ai_socktype = SOCK_STREAM; // TCP stream sockets
|
hints.ai_socktype = SOCK_STREAM; // TCP stream sockets
|
||||||
if (getaddrinfo(hostname, port_str, 0, &addr_info) != 0) {
|
if (getaddrinfo(hostname, port_str, 0, &addr_info) != 0) {
|
||||||
freeaddrinfo(addr_info);
|
freeaddrinfo(addr_info);
|
||||||
|
Loading…
Reference in New Issue
Block a user