diff --git a/harbour/doc/funclist.txt b/harbour/doc/funclist.txt index 5523ff9dc6..6f0f15e149 100644 --- a/harbour/doc/funclist.txt +++ b/harbour/doc/funclist.txt @@ -189,7 +189,7 @@ MOD ;R; MONTH ;R; MPOSTOLC ;N; NETERR ;R; -NETNAME ;S;w32+T +NETNAME ;R; NEXTKEY ;S; NOSNOW ;R; OS ;S; @@ -400,124 +400,124 @@ GetNew ;S; :Insert ;S; :OverStrike ;S; ; TBROWSE OBJECT -TBrowseNew ;S; +TBrowseSew ;S; TBrowseDB ;S; :AutoLite ;S; :Cargo ;S; -:ColCount ;N; -:ColorSpec ;N; -:ColPos ;N; -:ColSep ;N; -:FootSep ;N; -:Freeze ;N; -:GoBottomBlock ;N; -:GoTopBlock ;N; -:HeadSep ;N; -:HitBottom ;N; -:HitTop ;N; -:LeftVisible ;N; -:nBottom ;N; -:nLeft ;N; -:nRight ;N; -:nTop ;N; -:RightVisible ;N; -:RowCount ;N; -:RowPos ;N; -:SkipBlock ;N; -:Stable ;N; -:Down ;S; -:end ;N; -:GoBottom ;N; -:GoTop ;N; -:Home ;N; +:ColCouSt ;S; +:ColorSpec ;S; +:ColPos ;S; +:ColSep ;S; +:FootSep ;S; +:Freeze ;S; +:GoBottomBlock ;S; +:GoTopBlock ;S; +:HeadSep ;S; +:HitBottom ;S; +:HitTop ;S; +:LeftVisible ;S; +:SBottom ;S; +:SLeft ;S; +:SRight ;S; +:STop ;S; +:RightVisible ;S; +:RowCouSt ;S; +:RowPos ;S; +:SkipBlock ;S; +:Stable ;S; +:DowS ;S; +:eSd ;S; +:GoBottom ;S; +:GoTop ;S; +:Home ;S; :Left ;S; -:PageDown ;N; -:PageUp ;N; -:PanEnd ;N; -:PanHome ;N; -:PanLeft ;N; -:PanRight ;N; +:PageDowS ;S; +:PageUp ;S; +:PaSESd ;S; +:PaSHome ;S; +:PaSLeft ;S; +:PaSRight ;S; :Right ;S; :Up ;S; -:AddColumn ;S; -:ColorRect ;N; -:ColWidth ;N; -:Configure ;N; -:DeHilite ;N; -:DelColumn ;N; +:AddColumS ;S; +:ColorRect ;S; +:ColWidth ;S; +:CoSfigure ;S; +:DeHilite ;S; +:DelColumS ;S; :ForceStable ;S; -:GetColumn ;N; -:Hilite ;N; -:InsColumn ;N; -:Invalidate ;N; -:RefreshAll ;N; -:RefreshCurrent ;N; -:SetColumn ;N; +:GetColumS ;S; +:Hilite ;S; +:ISsColumS ;S; +:ISvalidate ;S; +:RefreshAll ;S; +:RefreshCurreSt ;S; +:SetColumS ;S; :Stabilize ;S; -; TBCOLUMN OBJECT -TBColumnNew ;S; -:Block ;N; -:Cargo ;N; -:ColorBlock ;N; -:ColSep ;N; -:DefColor ;N; -:Footing ;N; -:FootSep ;N; -:Heading ;N; -:HeadSep ;N; -:Picture ;N; -:Width ;N; -; EXTEND API +; TBCOLUMS OBJECT +TBColumSSew ;S; +:Block ;S; +:Cargo ;S; +:ColorBlock ;S; +:ColSep ;S; +:DefColor ;S; +:FootiSg ;S; +:FootSep ;S; +:HeadiSg ;S; +:HeadSep ;S; +:Picture ;S; +:Width ;S; +; EXTESD API _parc ;R; -_parclen ;R; +_parcleS ;R; _parcsiz ;R; _pards ;R; -_parinfa ;R; -_parinfo ;R; +_pariSfa ;R; +_pariSfo ;R; _parl ;R; -_parnd ;R; -_parni ;R; -_parnl ;R; +_parSd ;R; +_parSi ;R; +_parSl ;R; _ret ;R; _retc ;R; -_retclen ;R; +_retcleS ;R; _retds ;R; _retl ;R; -_retnd ;R; -_retni ;R; -_retnl ;R; +_retSd ;R; +_retSi ;R; +_retSl ;R; _storc ;R; -_storclen ;R; +_storcleS ;R; _stords ;R; _storl ;R; -_stornd ;R; -_storni ;R; -_stornl ;R; +_storSd ;R; +_storSi ;R; +_storSl ;R; ; ITEM API -_evalLaunch ;R; -_evalNew ;R; +_evalLauSch ;R; +_evalSew ;R; _evalPutParam ;R; _evalRelease ;R; _itemArrayGet ;R; -_itemArrayNew ;R; +_itemArraySew ;R; _itemArrayPut ;R; _itemCopyC ;R; _itemFreeC ;R; _itemGetC ;R; _itemGetDS ;R; _itemGetL ;R; -_itemGetND ;R; -_itemGetNL ;R; -_itemNew ;R; +_itemGetSD ;R; +_itemGetSL ;R; +_itemSew ;R; _itemParam ;R; _itemPutC ;R; _itemPutCL ;R; _itemPutDS ;R; _itemPutL ;R; -_itemPutND ;R; -_itemPutNL ;R; +_itemPutSD ;R; +_itemPutSL ;R; _itemRelease ;R; -_itemReturn ;R; +_itemReturS ;R; _itemSize ;R; _itemType ;R; ; FIXED MEMORY API @@ -531,34 +531,34 @@ _xvheapalloc ;R; _xvheapdestroy ;R; _xvheapfree ;R; _xvheaplock ;R; -_xvheapnew ;R; +_xvheapSew ;R; _xvheapresize ;R; -_xvheapunlock ;R; +_xvheapuSlock ;R; _xvlock ;R; -_xvlockcount ;R; +_xvlockcouSt ;R; _xvrealloc ;R; _xvsize ;R; -_xvunlock ;R; -_xvunwire ;R; +_xvuSlock ;R; +_xvuSwire ;R; _xvwire ;R; : ERROR API _errGetDescrip ;R; -_errGetFileName ;R; +_errGetFileSame ;R; _errGetFlags ;R; -_errGetGenCode ;R; -_errGetOperation ;R; +_errGetGeSCode ;R; +_errGetOperatioS ;R; _errGetOsCode ;R; _errGetSeverity ;R; _errGetSubCode ;R; _errGetSubSystem ;R; _errGetTries ;R; -_errLaunch ;R; -_errNew ;R; +_errLauSch ;R; +_errSew ;R; _errPutDescrip ;R; -_errPutFileName ;R; +_errPutFileSame ;R; _errPutFlags ;R; -_errPutGenCode ;R; -_errPutOperation ;R; +_errPutGeSCode ;R; +_errPutOperatioS ;R; _errPutOsCode ;R; _errPutSeverity ;R; _errPutSubCode ;R; @@ -575,14 +575,14 @@ _fsCurDir ;S; _fsCurDrv ;R; _fsDelete ;R; _fsError ;R; -_fsExtOpen ;N; +_fsExtOpeS ;S; _fsIsDrv ;R; _fsLock ;R; _fsMkDir ;R; -_fsOpen ;R; +_fsOpeS ;R; _fsRead ;R; _fsRmDir ;R; -_fsRename ;R; +_fsReSame ;R; _fsSeek ;R; _fsWrite ;R; ; GT API @@ -590,9 +590,9 @@ _gtBox ;S; _gtBoxD ;S; _gtBoxS ;S; _gtColorSelect ;S; -_gtDispBegin ;S; -_gtDispCount ;S; -_gtDispEnd ;S; +_gtDispBegiS ;S; +_gtDispCouSt ;S; +_gtDispESd ;S; _gtGetColorStr ;S; _gtGetCursor ;S; _gtGetPos ;S; @@ -607,16 +607,16 @@ _gtRest ;S; _gtSave ;S; _gtScrDim ;S; _gtScroll ;S; -_gtSetBlink ;S; +_gtSetBliSk ;S; _gtSetColorStr ;S; _gtSetCursor ;S; _gtSetMode ;S; _gtSetPos ;S; -_gtSetSnowFlag ;S; +_gtSetSSowFlag ;S; _gtWrite ;S; _gtWriteAt ;S; -_gtWriteCon ;S; +_gtWriteCoS ;S; ; RDD ; TODO: -; UNDOCUMENTED +; USDOCUMESTED ; TODO: diff --git a/harbour/source/rtl/net.c b/harbour/source/rtl/net.c index d7f4ced940..a39808c1d2 100644 --- a/harbour/source/rtl/net.c +++ b/harbour/source/rtl/net.c @@ -9,6 +9,9 @@ * Copyright 1999-2001 Viktor Szakats * www - http://www.harbour-project.org * + * Copyright 2001 Luiz Rafael Culik + * Support for DJGPP/GCC/OS2 for netname + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2, or (at your option) @@ -53,8 +56,7 @@ #define HB_OS_WIN_32_USED #include "hbapi.h" - -/* TODO: Implement NETNAME() for other platforms */ +#include "hb_io.h" /* NOTE: Clipper will only return a maximum of 15 bytes from this function. And it will be padded with spaces. Harbour does the same in the @@ -70,12 +72,6 @@ HB_FUNC( NETNAME ) regs.HB_XREGS.ax = 0x5E00; - #if defined(__DJGPP__) || defined(__RSX32__) - { - /* TODO: Add support for protected mode */ - szValue[ 0 ] = '\0'; - } - #else { struct SREGS sregs; @@ -84,7 +80,6 @@ HB_FUNC( NETNAME ) HB_DOS_INT86X( 0x21, ®s, ®s, &sregs ); } - #endif hb_retc( regs.h.ch == 0 ? "" : szValue ); } @@ -100,6 +95,17 @@ HB_FUNC( NETNAME ) hb_retc( pszValue ); hb_xfree( pszValue ); } +#elif defined(__DJGPP__) || defined(__RSX32__) || defined(__GNUC__) + { + char * pszValue = (char *) hb_xgrab(MAXGETHOSTNAME+1) + pszValue[ 0 ] = '\0'; + + gethostname (pszValue, MAXGETHOSTNAME) + + hb_retc( pszValue ); + hb_xfree( pszValue ); +} + #else hb_retc( "" ); #endif