--- xdb-1.2.0.orig/xdb/ntx.cpp +++ xdb-1.2.0/xdb/ntx.cpp @@ -107,26 +107,26 @@ void xbNtx::DumpNodeChain( void ) { xbNodeLink *n; - cout << "\n*************************\n"; - cout << "NodeLinkCtr = " << NodeLinkCtr; - cout << "\nReused = " << ReusedNodeLinks << "\n"; + std::cout << "\n*************************\n"; + std::cout << "NodeLinkCtr = " << NodeLinkCtr; + std::cout << "\nReused = " << ReusedNodeLinks << "\n"; n = NodeChain; while(n) { - cout << "xbNodeLink Chain" << n->NodeNo << "\n"; + std::cout << "xbNodeLink Chain" << n->NodeNo << "\n"; n = n->NextNode; } n = FreeNodeChain; while(n) { - cout << "FreeNodeLink Chain" << n->NodeNo << "\n"; + std::cout << "FreeNodeLink Chain" << n->NodeNo << "\n"; n = n->NextNode; } n = DeleteChain; while(n) { - cout << "DeleteLink Chain" << n->NodeNo << "\n"; + std::cout << "DeleteLink Chain" << n->NodeNo << "\n"; n = n->NextNode; } } @@ -193,18 +193,18 @@ #ifdef XBASE_DEBUG void xbNtx::DumpHdrNode( void ) { - cout << "\nSignature = " << HeadNode.Signature; - cout << "\nVersion = " << HeadNode.Version; - cout << "\nStartPahe = " << HeadNode.StartNode; - cout << "\nUnusedOffset = " << HeadNode.UnusedOffset; - cout << "\nKeySize = " << HeadNode.KeySize; - cout << "\nKeyLen = " << HeadNode.KeyLen; - cout << "\nDecimalCount = " << HeadNode.DecimalCount; - cout << "\nKeysPerNode = " << HeadNode.KeysPerNode; - cout << "\nHalfKeysPerPage = " << HeadNode.HalfKeysPerNode; - cout << "\nKeyExpression = " << HeadNode.KeyExpression; - cout << "\nUnique = " << HeadNode.Unique; - cout << "\n"; + std::cout << "\nSignature = " << HeadNode.Signature; + std::cout << "\nVersion = " << HeadNode.Version; + std::cout << "\nStartPahe = " << HeadNode.StartNode; + std::cout << "\nUnusedOffset = " << HeadNode.UnusedOffset; + std::cout << "\nKeySize = " << HeadNode.KeySize; + std::cout << "\nKeyLen = " << HeadNode.KeyLen; + std::cout << "\nDecimalCount = " << HeadNode.DecimalCount; + std::cout << "\nKeysPerNode = " << HeadNode.KeysPerNode; + std::cout << "\nHalfKeysPerPage = " << HeadNode.HalfKeysPerNode; + std::cout << "\nKeyExpression = " << HeadNode.KeyExpression; + std::cout << "\nUnique = " << HeadNode.Unique; + std::cout << "\n"; } #endif /***********************************************************************/ @@ -420,11 +420,11 @@ GetLeafNode( n, 0 ); NoOfKeys = dbf->xbase->GetShort( Node ); p = Node + 4; /* go past no of keys */ - cout << "\n--------------------------------------------------------"; - cout << "\nNode # " << n << " Number of keys = " << NoOfKeys << "\n"; + std::cout << "\n--------------------------------------------------------"; + std::cout << "\nNode # " << n << " Number of keys = " << NoOfKeys << "\n"; - cout << "\n Key Left Rec Key"; - cout << "\nNumber Branch Number Data"; + std::cout << "\n Key Left Rec Key"; + std::cout << "\nNumber Branch Number Data"; for( i = 0; i < GetKeysPerNode()+1 /*NoOfKeys*/; i++ ) { @@ -432,8 +432,8 @@ p+=4; RecNo = dbf->xbase->GetLong( p ); p+=4; - cout << "\n" << i << " " << LeftBranch << " " << RecNo << " "; - for( j = 0; j < HeadNode.KeyLen; j++ ) cout << *p++; + std::cout << "\n" << i << " " << LeftBranch << " " << RecNo << " "; + for( j = 0; j < HeadNode.KeyLen; j++ ) std::cout << *p++; } } #endif @@ -494,9 +494,9 @@ { if (RecNo > (this->HeadNode.KeysPerNode + 1)) { - cout << "RecNo = " << RecNo << endl; - cout << "this->HeadNode.KeysPerNode = " << this->HeadNode.KeysPerNode << endl; - cout << "********************* BUG ***********************" << endl; + std::cout << "RecNo = " << RecNo << std::endl; + std::cout << "this->HeadNode.KeysPerNode = " << this->HeadNode.KeysPerNode << std::endl; + std::cout << "********************* BUG ***********************" << std::endl; // ;-) exit(1); } @@ -2172,7 +2172,7 @@ if( !n ) return XB_INVALID_NODELINK; if( !GetDbfNo( 0, n )) { - cout << "Fatal index error - Not a leaf node" << n->NodeNo << "\n"; + std::cout << "Fatal index error - Not a leaf node" << n->NodeNo << "\n"; // exit(0); return XB_NOT_LEAFNODE; } @@ -2485,7 +2485,7 @@ // else // { // /* this should never be true-but could be if 100 byte limit is ignored*/ -// cout << "Fatal index error\n"; +// std::cout << "Fatal index error\n"; // exit(0); // } // return XB_NO_ERROR; @@ -2792,7 +2792,7 @@ // { // // Clipper, don't know why // PutLeftNodeNo(0, n2 , -1 ); -// cout << "Clipper hack" << endl; +// std::cout << "Clipper hack" << std::endl; // } DeleteKeyOffset( (n2->Leaf.NoOfKeysThisNode - median) -1, n2); @@ -2803,10 +2803,10 @@ for (i = n1->Leaf.NoOfKeysThisNode; i < median -1; i++) { - cout << " i = " << i << endl; + std::cout << " i = " << i << std::endl; strcpy(KeyBuf, GetKeyData( 0, n2 )); PutKeyData( i, n1); - cout << "KeyBuf = " << KeyBuf << endl; + std::cout << "KeyBuf = " << KeyBuf << std::endl; PutLeftNodeNo( i, n1, GetLeftNodeNo( 0, n2) ); PutDbfNo ( i , n1, GetDbfNo( 0, n2 ) ); @@ -2814,7 +2814,7 @@ // { // // Clipper, don't know why // PutLeftNodeNo(0, n2 , -1 ); -// cout << "Clipper hack in loop i = " << i << endl; +// std::cout << "Clipper hack in loop i = " << i << std::endl; // } // Remove the key from the current node. @@ -2841,12 +2841,12 @@ xbShort rc; xbLong ctr = 1L; - if ( option ) cout << "Checking NTX " << IndexName << endl; + if ( option ) std::cout << "Checking NTX " << IndexName << std::endl; rc = dbf->GetRecord( ctr ); while( ctr < dbf->NoOfRecords() ) { ctr++; - if( option ) cout << "\nChecking Record " << ctr; + if( option ) std::cout << "\nChecking Record " << ctr; if(!dbf->RecordDeleted()) { CreateKey( 0, 0 ); @@ -2855,8 +2855,8 @@ { if( option ) { - cout << "\nRecord number " << dbf->GetCurRecNo() << " Not Found\n"; - cout << "Key = " << KeyBuf << "\n"; + std::cout << "\nRecord number " << dbf->GetCurRecNo() << " Not Found\n"; + std::cout << "Key = " << KeyBuf << "\n"; } return rc; } @@ -2867,8 +2867,8 @@ if( option ) { - cout << "Exiting with rc = " << rc << "\n"; - cout << "\nTotal records checked = " << ctr << "\n"; + std::cout << "Exiting with rc = " << rc << "\n"; + std::cout << "\nTotal records checked = " << ctr << "\n"; } return XB_NO_ERROR; --- xdb-1.2.0.orig/xdb/ndx.cpp +++ xdb-1.2.0/xdb/ndx.cpp @@ -107,26 +107,26 @@ void xbNdx::DumpNodeChain( void ) { xbNdxNodeLink *n; - cout << "\n*************************\n"; - cout << "xbNodeLinkCtr = " << xbNodeLinkCtr; - cout << "\nReused = " << ReusedxbNodeLinks << "\n"; + std::cout << "\n*************************\n"; + std::cout << "xbNodeLinkCtr = " << xbNodeLinkCtr; + std::cout << "\nReused = " << ReusedxbNodeLinks << "\n"; n = NodeChain; while(n) { - cout << "xbNodeLink Chain" << n->NodeNo << "\n"; + std::cout << "xbNodeLink Chain" << n->NodeNo << "\n"; n = n->NextNode; } n = FreeNodeChain; while(n) { - cout << "FreexbNodeLink Chain" << n->NodeNo << "\n"; + std::cout << "FreexbNodeLink Chain" << n->NodeNo << "\n"; n = n->NextNode; } n = DeleteChain; while(n) { - cout << "DeleteLink Chain" << n->NodeNo << "\n"; + std::cout << "DeleteLink Chain" << n->NodeNo << "\n"; n = n->NextNode; } } @@ -175,20 +175,20 @@ #ifdef XBASE_DEBUG void xbNdx::DumpHdrNode( void ) { - cout << "\nStart node = " << HeadNode.StartNode; - cout << "\nTotal nodes = " << HeadNode.TotalNodes; - cout << "\nNo of keys = " << HeadNode.NoOfKeys; - cout << "\nKey Length = " << HeadNode.KeyLen; - cout << "\nKeys Per Node = " << HeadNode.KeysPerNode; - cout << "\nKey type = " << HeadNode.KeyType; - cout << "\nKey size = " << HeadNode.KeySize; - cout << "\nUnknown 2 = " << HeadNode.Unknown2; - cout << "\nUnique = " << HeadNode.Unique; - cout << "\nKeyExpression = " << HeadNode.KeyExpression; + std::cout << "\nStart node = " << HeadNode.StartNode; + std::cout << "\nTotal nodes = " << HeadNode.TotalNodes; + std::cout << "\nNo of keys = " << HeadNode.NoOfKeys; + std::cout << "\nKey Length = " << HeadNode.KeyLen; + std::cout << "\nKeys Per Node = " << HeadNode.KeysPerNode; + std::cout << "\nKey type = " << HeadNode.KeyType; + std::cout << "\nKey size = " << HeadNode.KeySize; + std::cout << "\nUnknown 2 = " << HeadNode.Unknown2; + std::cout << "\nUnique = " << HeadNode.Unique; + std::cout << "\nKeyExpression = " << HeadNode.KeyExpression; #ifdef XB_VAR_NODESIZE - cout << "\nNodeSize = " << NodeSize; + std::cout << "\nNodeSize = " << NodeSize; #endif // XB_VAR_NODESIZE - cout << "\n"; + std::cout << "\n"; } #endif /***********************************************************************/ @@ -415,11 +415,11 @@ GetLeafNode( n, 0 ); NoOfKeys = dbf->xbase->GetLong( Node ); p = Node + 4; /* go past no of keys */ - cout << "\n--------------------------------------------------------"; - cout << "\nNode # " << n << " Number of keys = " << NoOfKeys << "\n"; + std::cout << "\n--------------------------------------------------------"; + std::cout << "\nNode # " << n << " Number of keys = " << NoOfKeys << "\n"; - cout << "\n Key Left Rec Key"; - cout << "\nNumber Branch Number Data"; + std::cout << "\n Key Left Rec Key"; + std::cout << "\nNumber Branch Number Data"; for( i = 0; i < GetKeysPerNode() /*NoOfKeys*/; i++ ) { @@ -427,12 +427,12 @@ p+=4; RecNo = dbf->xbase->GetLong( p ); p+=4; - cout << "\n" << i << " " << LeftBranch << " " << RecNo << " "; + std::cout << "\n" << i << " " << LeftBranch << " " << RecNo << " "; if( !HeadNode.KeyType ) - for( j = 0; j < HeadNode.KeyLen; j++ ) cout << *p++; + for( j = 0; j < HeadNode.KeyLen; j++ ) std::cout << *p++; else { - cout << dbf->xbase->GetDouble( p ); + std::cout << dbf->xbase->GetDouble( p ); p += 8; } } @@ -1682,7 +1682,7 @@ /* if not at the end of the node shift everthing to the right */ if( n1->CurKeyNo+1 < HeadNode.KeysPerNode ) /* this clause appears to work */ { - if( CurNode->NodeNo == HeadNode.StartNode ) cout << "\nHead node "; + if( CurNode->NodeNo == HeadNode.StartNode ) std::cout << "\nHead node "; for( j = 0,i = n1->CurKeyNo+1; i < n1->Leaf.NoOfKeysThisNode; i++,j++ ) { @@ -2043,7 +2043,7 @@ if( !GetDbfNo( 0, n )) { - cout << "Fatal index error - Not a leaf node" << n->NodeNo << "\n"; + std::cout << "Fatal index error - Not a leaf node" << n->NodeNo << "\n"; /* exit(0); */ /* Great code!!! We exit, then return error!!! */ /* Library SHOULD NOT do exit */ xb_error(XB_NOT_LEAFNODE); @@ -2358,7 +2358,7 @@ else { /* this should never be true-but could be if 100 byte limit is ignored*/ - cout << "Fatal index error\n"; + std::cout << "Fatal index error\n"; exit(0); } return XB_NO_ERROR; @@ -2426,7 +2426,7 @@ while( ctr < dbf->NoOfRecords() ) { ctr++; - if( option ) cout << "\nChecking Record " << ctr; + if( option ) std::cout << "\nChecking Record " << ctr; if(!dbf->RecordDeleted()) { CreateKey( 0, 0 ); @@ -2435,8 +2435,8 @@ { if( option ) { - cout << "\nRecord number " << dbf->GetCurRecNo() << " Not Found\n"; - cout << "Key = " << KeyBuf << "\n"; + std::cout << "\nRecord number " << dbf->GetCurRecNo() << " Not Found\n"; + std::cout << "Key = " << KeyBuf << "\n"; } return rc; } @@ -2445,8 +2445,8 @@ return rc; } if( option ){ - cout << "\nTotal records checked = " << ctr << "\n"; - cout << "Exiting with rc = " << rc << "\n"; + std::cout << "\nTotal records checked = " << ctr << "\n"; + std::cout << "Exiting with rc = " << rc << "\n"; } return XB_NO_ERROR; --- xdb-1.2.0.orig/xdb/exp.cpp +++ xdb-1.2.0/xdb/exp.cpp @@ -141,7 +141,7 @@ i++; } - cout << "\nGetFuncInfo error function = " << Function << "\n"; + std::cout << "\nGetFuncInfo error function = " << Function << "\n"; return -1; } /*************************************************************************/ @@ -1089,7 +1089,7 @@ xbExpNode * Temp; Temp = NextFreeExpNode; - cout << "\nFree Exp Node chain..."; + std::cout << "\nFree Exp Node chain..."; while( Temp ) { DumpExpNode( Temp ); @@ -1099,23 +1099,23 @@ } /************************************************************************/ void xbExpn::DumpExpNode(xbExpNode *e) { - cout << "\n\n****** Exp Node ******"; - cout << "\nExp Node Address " << e; - cout << " Node Text = " << e->NodeText; - cout << "\nType = " << e->Type; - cout << " Len = " << e->Len; - cout << " InTree = " << e->InTree; - cout << "\nParent = " << e->Node; - cout << "\nField No = " << e->FieldNo; - cout << "\nExpressionType = " << e->ExpressionType; - cout << "\nResult = " << e->Result; - cout << " DoubResult = " << e->DoubResult; - cout << " IntResult = " << e->IntResult; - cout << " ResultLen = " << e->ResultLen; - cout << " DataLen = " << e->DataLen; - cout << " Sibling 1 = " << e->Sibling1; - cout << " Sibling 2 = " << e->Sibling2; - if( e->Sibling3 ) cout << " Sibling3 = " << e->Sibling3; + std::cout << "\n\n****** Exp Node ******"; + std::cout << "\nExp Node Address " << e; + std::cout << " Node Text = " << e->NodeText; + std::cout << "\nType = " << e->Type; + std::cout << " Len = " << e->Len; + std::cout << " InTree = " << e->InTree; + std::cout << "\nParent = " << e->Node; + std::cout << "\nField No = " << e->FieldNo; + std::cout << "\nExpressionType = " << e->ExpressionType; + std::cout << "\nResult = " << e->Result; + std::cout << " DoubResult = " << e->DoubResult; + std::cout << " IntResult = " << e->IntResult; + std::cout << " ResultLen = " << e->ResultLen; + std::cout << " DataLen = " << e->DataLen; + std::cout << " Sibling 1 = " << e->Sibling1; + std::cout << " Sibling 2 = " << e->Sibling2; + if( e->Sibling3 ) std::cout << " Sibling3 = " << e->Sibling3; return; } #endif --- xdb-1.2.0.orig/xdb/dbf.h +++ xdb-1.2.0/xdb/dbf.h @@ -38,7 +38,7 @@ #include #include -#include +#include #include /*! \file dbf.h --- xdb-1.2.0.orig/xdb/expfunc.cpp +++ xdb-1.2.0/xdb/expfunc.cpp @@ -344,7 +344,7 @@ break; default: - cout << "\nInternal error. " << ptype; + std::cout << "\nInternal error. " << ptype; break; } Push( (void *) WorkNode ); --- xdb-1.2.0.orig/xdb/Makefile.am +++ xdb-1.2.0/xdb/Makefile.am @@ -31,8 +31,9 @@ html.cpp lock.cpp memo.cpp ndx.cpp stack.cpp xbase.cpp xdate.cpp \ xbexcept.cpp xbstring.cpp index.cpp ntx.cpp -#libxdb_la_LDFLAGS = -version-info 0:0:0 -libxdb_la_LDFLAGS = -release 1.2.0 +# libxdb_la_LDFLAGS = -version-info 0:0:0 +# libxdb_la_LDFLAGS = -release 1.2.0 +libxdb_la_LDFLAGS = -version-info 1:2:0 libxdb_la_LIBADD = MAINTAINERCLEANFILES = Makefile.in stamp-h.in xbconfig.h.in --- xdb-1.2.0.orig/xdb/html.cpp +++ xdb-1.2.0/xdb/html.cpp @@ -44,7 +44,7 @@ /************************************************************************/ void xbHtml::TextOut( const char * String ) { - cout << String; + std::cout << String; } /************************************************************************/ void xbHtml::InitVals( void ) @@ -68,18 +68,18 @@ xbShort i; if( NoOfDataFields == 0 ) - cout << "No Input Data From Form\n"; + std::cout << "No Input Data From Form\n"; else { - cout << "There are " << NoOfDataFields << " fields"; - cout << "
" << NoOfDataFields << " Field Name / Data Values received\n"; - cout << "
-----------------------------------\n"; + std::cout << "There are " << NoOfDataFields << " fields"; + std::cout << "
" << NoOfDataFields << " Field Name / Data Values received\n"; + std::cout << "
-----------------------------------\n"; for( i = 0; i < NoOfDataFields; i++ ) { - cout << "
" << FieldNameArray[i] << " => "; + std::cout << "
" << FieldNameArray[i] << " => "; // PrintEncodedString( DataValueArray[i] ); if( DataValueArray[i] ) - cout << DataValueArray[i]; + std::cout << DataValueArray[i]; } } } @@ -289,60 +289,60 @@ xbShort i; char buf[255]; - cout << "\n"; + std::cout << "\n
"; if( Title ) - cout << "\n
"; + std::cout << "\n
"; i = 0; while( fl[i].FieldLen != 0 ) { - cout << "\n
" << Title << "" << Title << "
" << fl[i].Label; + std::cout << "\n
" << fl[i].Label; if( fl[i].Option == 2 ) { if( !d ) xb_error(XB_NOT_OPEN); d->GetField( fl[i].FieldNo, buf ); - cout << "" << buf; + std::cout << "" << buf; } else { - cout << ""; + std::cout << ">"; } i++; } - cout << "\n
"; + std::cout << "\n"; return XB_NO_ERROR; } /************************************************************************/ void xbHtml::StartHtmlPage( const char * Title ) { - cout << "Content-type: text/html\n\n"; - cout << "\n" << Title << ""; + std::cout << "Content-type: text/html\n\n"; + std::cout << "\n" << Title << ""; } /************************************************************************/ void xbHtml::PrintEncodedChar( char c ) { switch( c ) { - case '<': cout << "<"; break; - case '>': cout << ">"; break; - case '&': cout << "&"; break; - case '"': cout << """; break; - default: cout << c; break; + case '<': std::cout << "<"; break; + case '>': std::cout << ">"; break; + case '&': std::cout << "&"; break; + case '"': std::cout << """; break; + default: std::cout << c; break; } return; } @@ -365,23 +365,23 @@ ) xb_error(XB_INVALID_OPTION); - cout << "\nSet-Cookie: " << Name << "=" << Value << ";"; + std::cout << "\nSet-Cookie: " << Name << "=" << Value << ";"; if( ExpDate ) { - cout << ExpDate << ";"; + std::cout << ExpDate << ";"; if( ExpTime ) - cout << ExpTime; + std::cout << ExpTime; else - cout << "00:00:00"; - cout << TimeZone << ";"; + std::cout << "00:00:00"; + std::cout << TimeZone << ";"; } if( Path ) - cout << "\nPath=" << Path << ";"; + std::cout << "\nPath=" << Path << ";"; if( Domain ) - cout << "domain=" << Domain << ";"; + std::cout << "domain=" << Domain << ";"; if( Secure ) - cout << "Secure"; - cout << "\n"; + std::cout << "Secure"; + std::cout << "\n"; return XB_NO_ERROR; } /************************************************************************/ @@ -405,7 +405,7 @@ /************************************************************************/ void xbHtml::SendRedirect( char * url ) const { - cout << "Location: " << url << endl << endl; + std::cout << "Location: " << url << std::endl << std::endl; } /************************************************************************/ void xbHtml::PlusToSpace( char * String ) --- xdb-1.2.0.orig/xdb/Makefile.in +++ xdb-1.2.0/xdb/Makefile.in @@ -121,8 +121,9 @@ libxdb_la_SOURCES = dbf.cpp exp.cpp expfunc.cpp expproc.cpp fields.cpp html.cpp lock.cpp memo.cpp ndx.cpp stack.cpp xbase.cpp xdate.cpp xbexcept.cpp xbstring.cpp index.cpp ntx.cpp -#libxdb_la_LDFLAGS = -version-info 0:0:0 -libxdb_la_LDFLAGS = -release 1.2.0 +# libxdb_la_LDFLAGS = -version-info 0:0:0 +# libxdb_la_LDFLAGS = -release 1.2.0 +libxdb_la_LDFLAGS = -version-info 1:2:0 libxdb_la_LIBADD = MAINTAINERCLEANFILES = Makefile.in stamp-h.in xbconfig.h.in @@ -152,7 +153,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best SOURCES = $(libxdb_la_SOURCES) OBJECTS = $(libxdb_la_OBJECTS) @@ -318,31 +319,13 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done -database.lo database.o : database.cpp -dbf.lo dbf.o : dbf.cpp -exp.lo exp.o : exp.cpp -expfunc.lo expfunc.o : expfunc.cpp -expproc.lo expproc.o : expproc.cpp -fields.lo fields.o : fields.cpp -html.lo html.o : html.cpp -index.lo index.o : index.cpp -lock.lo lock.o : lock.cpp -memo.lo memo.o : memo.cpp -ndx.lo ndx.o : ndx.cpp -ntx.lo ntx.o : ntx.cpp -stack.lo stack.o : stack.cpp -xbase.lo xbase.o : xbase.cpp -xbexcept.lo xbexcept.o : xbexcept.cpp -xbstring.lo xbstring.o : xbstring.cpp -xdate.lo xdate.o : xdate.cpp - info-am: info: info-am dvi-am: --- xdb-1.2.0.orig/xdb/ndx.h +++ xdb-1.2.0/xdb/ndx.h @@ -172,9 +172,9 @@ xbShort GetLeafNode( xbLong, xbShort ); xbNdxNodeLink * GetNodeMemory( void ); void ReleaseNodeMemory( xbNdxNodeLink * ); - xbShort xbNdx::BSearchNode(const char *key, xbShort klen, - const xbNdxNodeLink *node, - xbShort *comp); + xbShort BSearchNode(const char *key, xbShort klen, + const xbNdxNodeLink *node, + xbShort *comp); xbLong GetLeafFromInteriorNode( const char *Tkey, xbShort Klen ); xbShort CalcKeyLen( void ); xbShort PutKeyData( xbShort, xbNdxNodeLink * ); --- xdb-1.2.0.orig/xdb/xbase.cpp +++ xdb-1.2.0/xdb/xbase.cpp @@ -328,52 +328,52 @@ void xbXBase::DisplayError( const xbShort ErrorNo ) const { switch( ErrorNo ) { - case 0: cout << "No Error" << endl; break; - case -100: cout << "End Of File" << endl; break; -// case -101: cout << "Beginning Of File" << endl; break; - case -102: cout << "No Memory" << endl; break; - case -103: cout << "File Already Exists" << endl; break; - case -104: cout << "Database or Index Open Error" << endl; break; - case -105: cout << "Error writing to disk drive" << endl; break; - case -106: cout << "Unknown Field Type" << endl; break; - case -107: cout << "Database already open" << endl; break; - case -108: cout << "Not an Xbase type database" << endl; break; - case -109: cout << "Invalid Record Number" << endl; break; - case -110: cout << "Invalid Option" << endl; break; - case -111: cout << "Database not open" << endl; break; - case -112: cout << "Disk Drive Seek Error" << endl; break; - case -113: cout << "Disk Drive Read Error" << endl; break; - case -114: cout << "Search Key Not Found" << endl; break; - case -115: cout << "Search Key Found" << endl; break; - case -116: cout << "Invalid Key" << endl; break; - case -117: cout << "Invalid Node Link" << endl; break; - case -118: cout << "Key Not Unique" << endl; break; - case -119: cout << "Invalid Key Expression" << endl; break; -// case -120: cout << "DBF File Not Open" << endl; break; - case -121: cout << "Invalid Key Type" << endl; break; - case -122: cout << "Invalid Node No" << endl; break; - case -123: cout << "Node Full" << endl; break; - case -124: cout << "Invalid Field Number" << endl; break; - case -125: cout << "Invalid Data" << endl; break; - case -126: cout << "Not a leaf node" << endl; break; - case -127: cout << "Lock Failed" << endl; break; - case -128: cout << "Close Error" << endl; break; - case -129: cout << "Invalid Schema" << endl; break; - case -130: cout << "Invalid Name" << endl; break; - case -131: cout << "Invalid Block Size" << endl; break; - case -132: cout << "Invalid Block Number" << endl; break; - case -133: cout << "Not a Memo field" << endl; break; - case -134: cout << "No Memo Data" << endl; break; - case -135: cout << "Expression syntax error" << endl; break; - case -136: cout << "Parse Error" << endl; break; - case -137: cout << "No Data" << endl; break; -// case -138: cout << "Unknown Token Type" << endl; break; + case 0: std::cout << "No Error" << std::endl; break; + case -100: std::cout << "End Of File" << std::endl; break; +// case -101: std::cout << "Beginning Of File" << std::endl; break; + case -102: std::cout << "No Memory" << std::endl; break; + case -103: std::cout << "File Already Exists" << std::endl; break; + case -104: std::cout << "Database or Index Open Error" << std::endl; break; + case -105: std::cout << "Error writing to disk drive" << std::endl; break; + case -106: std::cout << "Unknown Field Type" << std::endl; break; + case -107: std::cout << "Database already open" << std::endl; break; + case -108: std::cout << "Not an Xbase type database" << std::endl; break; + case -109: std::cout << "Invalid Record Number" << std::endl; break; + case -110: std::cout << "Invalid Option" << std::endl; break; + case -111: std::cout << "Database not open" << std::endl; break; + case -112: std::cout << "Disk Drive Seek Error" << std::endl; break; + case -113: std::cout << "Disk Drive Read Error" << std::endl; break; + case -114: std::cout << "Search Key Not Found" << std::endl; break; + case -115: std::cout << "Search Key Found" << std::endl; break; + case -116: std::cout << "Invalid Key" << std::endl; break; + case -117: std::cout << "Invalid Node Link" << std::endl; break; + case -118: std::cout << "Key Not Unique" << std::endl; break; + case -119: std::cout << "Invalid Key Expression" << std::endl; break; +// case -120: std::cout << "DBF File Not Open" << std::endl; break; + case -121: std::cout << "Invalid Key Type" << std::endl; break; + case -122: std::cout << "Invalid Node No" << std::endl; break; + case -123: std::cout << "Node Full" << std::endl; break; + case -124: std::cout << "Invalid Field Number" << std::endl; break; + case -125: std::cout << "Invalid Data" << std::endl; break; + case -126: std::cout << "Not a leaf node" << std::endl; break; + case -127: std::cout << "Lock Failed" << std::endl; break; + case -128: std::cout << "Close Error" << std::endl; break; + case -129: std::cout << "Invalid Schema" << std::endl; break; + case -130: std::cout << "Invalid Name" << std::endl; break; + case -131: std::cout << "Invalid Block Size" << std::endl; break; + case -132: std::cout << "Invalid Block Number" << std::endl; break; + case -133: std::cout << "Not a Memo field" << std::endl; break; + case -134: std::cout << "No Memo Data" << std::endl; break; + case -135: std::cout << "Expression syntax error" << std::endl; break; + case -136: std::cout << "Parse Error" << std::endl; break; + case -137: std::cout << "No Data" << std::endl; break; +// case -138: std::cout << "Unknown Token Type" << std::endl; break; - case -140: cout << "Invalid Field" << endl; break; - case -141: cout << "Insufficient Parms" << endl; break; - case -142: cout << "Invalid Function" << endl; break; - case -143: cout << "Invalid Field Length" << endl; break; - default: cout << "Unknown error code" << endl; break; + case -140: std::cout << "Invalid Field" << std::endl; break; + case -141: std::cout << "Insufficient Parms" << std::endl; break; + case -142: std::cout << "Invalid Function" << std::endl; break; + case -143: std::cout << "Invalid Field Length" << std::endl; break; + default: std::cout << "Unknown error code" << std::endl; break; } } /************************************************************************/ --- xdb-1.2.0.orig/xdb/dbf.cpp +++ xdb-1.2.0/xdb/dbf.cpp @@ -743,31 +743,31 @@ if( DbfStatus == XB_CLOSED ) xb_error(XB_NOT_OPEN); - cout << "\nDatabase file " << DatabaseName << endl << endl; + std::cout << "\nDatabase file " << DatabaseName << std::endl << std::endl; if( Option != 2 ) { - cout << "File header data:" << endl; + std::cout << "File header data:" << std::endl; if( Version == 3 ) - cout << "Dbase III file" << endl; + std::cout << "Dbase III file" << std::endl; else if ( Version == 83 ) - cout << "Dbase III file with memo fields" << endl << endl; + std::cout << "Dbase III file with memo fields" << std::endl << std::endl; - cout << "Last update date = " - << (int) UpdateMM << "/" << (int) UpdateDD << "/" << (int) UpdateYY << endl; + std::cout << "Last update date = " + << (int) UpdateMM << "/" << (int) UpdateDD << "/" << (int) UpdateYY << std::endl; - cout << "Header length = " << HeaderLen << endl; - cout << "Record length = " << RecordLen << endl; - cout << "Records in file = " << NoOfRecs << endl << endl; + std::cout << "Header length = " << HeaderLen << std::endl; + std::cout << "Record length = " << RecordLen << std::endl; + std::cout << "Records in file = " << NoOfRecs << std::endl << std::endl; #ifdef XB_REAL_DELETE - cout << "First Free Rec = " << FirstFreeRec << endl << endl; + std::cout << "First Free Rec = " << FirstFreeRec << std::endl << std::endl; #endif } if( Option != 1 ) { - cout << "Field Name Type Length Decimals" << endl; - cout << "---------- ---- ------ --------" << endl; + std::cout << "Field Name Type Length Decimals" << std::endl; + std::cout << "---------- ---- ------ --------" << std::endl; for( i = 0; i 0 ) @@ -778,7 +778,7 @@ SchemaPtr[i].Type, SchemaPtr[i].FieldLen, SchemaPtr[i].NoOfDecs ); } } - cout << endl; + std::cout << std::endl; return XB_NO_ERROR; } #endif @@ -1412,17 +1412,17 @@ if( i != XB_NO_ERROR ) return i; - cout << "\nREC NUMBER " << RecNo << "\n"; + std::cout << "\nREC NUMBER " << RecNo << "\n"; if( RecordDeleted() ) - cout << "\nRecord deleted...\n"; + std::cout << "\nRecord deleted...\n"; for( i = 0; i < NoOfFields; i++ ) { GetField( i, buf ); - cout << SchemaPtr[i].FieldName << " = '" << buf << "'\n"; + std::cout << SchemaPtr[i].FieldName << " = '" << buf << "'\n"; } - cout << "\n"; + std::cout << "\n"; return XB_NO_ERROR; } /************************************************************************/ --- xdb-1.2.0.orig/xdb/html.h +++ xdb-1.2.0/xdb/html.h @@ -54,13 +54,13 @@ class XBDLLEXPORT xbHtml { public: xbHtml ( void ); - void BoldOff( void ) { cout << "\n"; }; - void BoldOn( void ) { cout << ""; }; - void Bullet( void ) { cout << "
  • "; }; + void BoldOff( void ) { std::cout << "\n"; }; + void BoldOn( void ) { std::cout << ""; }; + void Bullet( void ) { std::cout << "
  • "; }; void DumpArray( void ); - void EmphasizeOff( void ) { cout << "\n"; }; - void EmphasizeOn( void ) { cout << ""; }; - void EndHtmlPage( void ) { cout << "\n\n"; } + void EmphasizeOff( void ) { std::cout << "\n"; }; + void EmphasizeOn( void ) { std::cout << ""; }; + void EndHtmlPage( void ) { std::cout << "\n\n"; } xbShort GenFormFields(xbDbf *d, xbShort Option,const char * Title,xbFieldList *fl); xbShort GetArrayNo( const char * FieldName ); const char * GetCookie( const char *CookieName ); @@ -68,20 +68,20 @@ char * GetDataForField( const char *FieldName ); char * GetEnv( char * s ){ return getenv( s ); } xbShort GetMethod( void ); - void HeaderOff( xbShort i ){ cout << "\n"; }; - void HeaderOn( xbShort i ){ cout << "\n"; }; - void ItalicOff( void ) { cout << "\n"; }; - void ItalicOn( void ) { cout << ""; }; - void NewLine( void ) { cout << "
    "; } + void HeaderOff( xbShort i ){ std::cout << "    \n"; }; + void HeaderOn( xbShort i ){ std::cout << "\n"; }; + void ItalicOff( void ) { std::cout << "\n"; }; + void ItalicOn( void ) { std::cout << ""; }; + void NewLine( void ) { std::cout << "
    "; } xbShort PostMethod( void ); void PrintEncodedChar( char ); void PrintEncodedString( const char *s ); - void PrintHtml( char * s ) { cout << s; }; - void PrintHtml( xbLong l ) { cout << l; }; - void PrintHtml( xbShort i ) { cout << i; }; - void PrintHtml( int i ) { cout << i; }; + void PrintHtml( char * s ) { std::cout << s; }; + void PrintHtml( xbLong l ) { std::cout << l; }; + void PrintHtml( xbShort i ) { std::cout << i; }; + void PrintHtml( int i ) { std::cout << i; }; void StartHtmlPage( const char *Title ); - void StartTextPage( void ) { cout << "Content-type: text/plain\n\n"; } + void StartTextPage( void ) { std::cout << "Content-type: text/plain\n\n"; } void TextOut( const char *String ); xbLong Tally( const char *FileName ); xbShort SetCookie(const char *Name, const char *Value, const char *ExpDate, --- xdb-1.2.0.orig/xdb/stack.cpp +++ xdb-1.2.0/xdb/stack.cpp @@ -33,7 +33,7 @@ #include #include -#include +#include #include @@ -147,32 +147,32 @@ xbStackElement * e; if( StackDepth == 0 ) { - cout << "\nStack is empty..."; + std::cout << "\nStack is empty..."; return; } - cout << "\nThere are " << StackDepth << " entries."; - cout << "\nFirst = " << First << " Last = " << Last; + std::cout << "\nThere are " << StackDepth << " entries."; + std::cout << "\nFirst = " << First << " Last = " << Last; e = First; while( e ) { - cout << "\n*****************************"; - cout << "\nThis = " << e; - cout << "\nNext = " << e->Next; - cout << "\nPrevious = " << e->Previous; - cout << "\nUser Pointer = " << e->UserPtr; + std::cout << "\n*****************************"; + std::cout << "\nThis = " << e; + std::cout << "\nNext = " << e->Next; + std::cout << "\nPrevious = " << e->Previous; + std::cout << "\nUser Pointer = " << e->UserPtr; e = e->Next; } - cout << "\nFree list follows..."; + std::cout << "\nFree list follows..."; e = Free; while( e ) { - cout << "\n*****************************"; - cout << "\nThis = " << e; - cout << "\nNext = " << e->Next; - cout << "\nPrevious = " << e->Previous; - cout << "\nUser Pointer = " << e->UserPtr; + std::cout << "\n*****************************"; + std::cout << "\nThis = " << e; + std::cout << "\nNext = " << e->Next; + std::cout << "\nPrevious = " << e->Previous; + std::cout << "\nUser Pointer = " << e->UserPtr; e = e->Next; } return; --- xdb-1.2.0.orig/xdb/memo.cpp +++ xdb-1.2.0/xdb/memo.cpp @@ -908,16 +908,16 @@ void xbDbf::DumpMemoHeader( void ) const { xbShort i; - cout << "\n*********************************"; - cout << "\nMemo header data..."; - cout << "\nNext Block " << MemoHeader.NextBlock; + std::cout << "\n*********************************"; + std::cout << "\nMemo header data..."; + std::cout << "\nNext Block " << MemoHeader.NextBlock; if( IsType4Dbt() ) { - cout << "\nFilename "; + std::cout << "\nFilename "; for( i = 0; i < 8; i++ ) - cout << MemoHeader.FileName[i]; + std::cout << MemoHeader.FileName[i]; } - cout << "\nBlocksize " << MemoHeader.BlockSize; + std::cout << "\nBlocksize " << MemoHeader.BlockSize; return; } /***********************************************************************/ @@ -930,16 +930,16 @@ return rc; LastDataBlock = CalcLastDataBlock(); CurBlock = MemoHeader.NextBlock; - cout << "\nTotal blocks in file = " << LastDataBlock; - cout << "\nHead Next Block = " << CurBlock; + std::cout << "\nTotal blocks in file = " << LastDataBlock; + std::cout << "\nHead Next Block = " << CurBlock; while( CurBlock < LastDataBlock ) { if(( rc = ReadMemoBlock( CurBlock, 2 )) != XB_NO_ERROR ) return rc; - cout << "\n**********************************"; - cout << "\nThis Block = " << CurBlock; - cout << "\nNext Block = " << NextFreeBlock; - cout << "\nNo Of Blocks = " << FreeBlockCnt << "\n"; + std::cout << "\n**********************************"; + std::cout << "\nThis Block = " << CurBlock; + std::cout << "\nNext Block = " << NextFreeBlock; + std::cout << "\nNo Of Blocks = " << FreeBlockCnt << "\n"; CurBlock = NextFreeBlock; } return XB_NO_ERROR; @@ -953,17 +953,17 @@ if( IsType3Dbt() ) { for( i = 0; i < 512; i++ ) - cout << *p++; + std::cout << *p++; } else { - cout << "\nField1 => " << mfield1; - cout << "\nStart Pos => " << MStartPos; - cout << "\nField Len => " << MFieldLen; - cout << "\nBlock data => "; + std::cout << "\nField1 => " << mfield1; + std::cout << "\nStart Pos => " << MStartPos; + std::cout << "\nField Len => " << MFieldLen; + std::cout << "\nBlock data => "; p += 8; for( i = 8; i < MemoHeader.BlockSize; i++ ) - cout << *p++; + std::cout << *p++; } return; } --- xdb-1.2.0.orig/config.guess +++ xdb-1.2.0/config.guess @@ -1,7 +1,11 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 93, 94, 95, 96, 1997 Free Software Foundation, Inc. -# +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. + +timestamp='2007-07-22' + # This file 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 of the License, or @@ -14,154 +18,327 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. -# Written by Per Bothner . -# The master version of this file is at the FSF in /home/gd/gnu/lib. + +# Originally written by Per Bothner . +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and # exits with 0. Otherwise, it exits with 1. # # The plan is that this can be called by configure scripts if you -# don't specify an explicit system type (host/target name). -# -# Only a few systems have been added to this list; please add others -# (but try to keep the structure clean). -# +# don't specify an explicit build system type. + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] + +Output the configuration name of the system \`$me' is run on. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.guess ($timestamp) + +Originally written by Per Bothner. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" >&2 + exit 1 ;; + * ) + break ;; + esac +done + +if test $# != 0; then + echo "$me: too many arguments$help" >&2 + exit 1 +fi + +trap 'exit 1' 1 2 15 + +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a +# compiler to aid in system detection is discouraged as it requires +# temporary files to be created and, as you can see below, it is a +# headache to deal with in a portable fashion. + +# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still +# use `HOST_CC' if defined, but it is deprecated. + +# Portable tmp directory creation inspired by the Autoconf team. + +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > $dummy.c ; + for c in cc gcc c89 c99 ; do + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found ; + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +esac ; set_cc_for_build= ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. -# (ghazi@noc.rutgers.edu 8/24/94.) +# (ghazi@noc.rutgers.edu 1994-08-24) if (test -f /.attbin/uname) >/dev/null 2>&1 ; then PATH=$PATH:/.attbin ; export PATH fi UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15 - # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or + # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward + # compatibility and a consistent mechanism for selecting the + # object file format. + # + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + case "${UNAME_MACHINE_ARCH}" in + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched + # to ELF recently, or will in the future. + case "${UNAME_MACHINE_ARCH}" in + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep __ELF__ >/dev/null + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? + os=netbsd + else + os=netbsdelf + fi + ;; + *) + os=netbsd + ;; + esac + # The OS release + # Debian GNU/NetBSD machines have a different userland, and + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. + case "${UNAME_VERSION}" in + Debian*) + release='-gnu' + ;; + *) + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + ;; + esac + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit ;; + *:OpenBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; + macppc:MirBSD:*:*) + echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit ;; alpha:OSF1:*:*) - if test $UNAME_RELEASE = "V4.0"; then + case $UNAME_RELEASE in + *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - fi + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac + # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - cat <dummy.s - .globl main - .ent main -main: - .frame \$30,0,\$26,0 - .prologue 0 - .long 0x47e03d80 # implver $0 - lda \$2,259 - .long 0x47e20c21 # amask $2,$1 - srl \$1,8,\$2 - sll \$2,2,\$2 - sll \$0,3,\$0 - addl \$1,\$0,\$0 - addl \$2,\$0,\$0 - ret \$31,(\$26),1 - .end main -EOF - ${CC-cc} dummy.s -o dummy 2>/dev/null - if test "$?" = 0 ; then - ./dummy - case "$?" in - 7) - UNAME_MACHINE="alpha" - ;; - 15) - UNAME_MACHINE="alphaev5" - ;; - 14) - UNAME_MACHINE="alphaev56" - ;; - 10) - UNAME_MACHINE="alphapca56" - ;; - 16) - UNAME_MACHINE="alphaev6" - ;; - esac - fi - rm -f dummy.s dummy - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]` - exit 0 ;; + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + exit ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix + exit ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 - exit 0 ;; + exit ;; Amiga*:UNIX_System_V:4.0:*) - echo m68k-cbm-sysv4 - exit 0;; - amiga:NetBSD:*:*) - echo m68k-cbm-netbsd${UNAME_RELEASE} - exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - arc64:OpenBSD:*:*) - echo mips64el-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hkmips:OpenBSD:*:*) - echo mips-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mips-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + echo m68k-unknown-sysv4 + exit ;; + *:[Aa]miga[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-amigaos + exit ;; + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos + exit ;; + *:OS/390:*:*) + echo i370-ibm-openedition + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} - exit 0;; - arm32:NetBSD:*:*) - echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - exit 0 ;; - SR2?01:HI-UX/MPP:*:*) + exit ;; + arm:riscos:*:*|arm:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp - exit 0;; - Pyramid*:OSx*:*:*|MIS*:OSx*:*:*) + exit ;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then echo pyramid-pyramid-sysv3 else echo pyramid-pyramid-bsd fi - exit 0 ;; - NILE:*:*:dcosx) + exit ;; + NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 - exit 0 ;; + exit ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7; exit ;; + esac ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - i86pc:SunOS:5.*:*) + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in Series*|S4*) @@ -170,12 +347,12 @@ esac # Japanese Language versions have a version number like `4.1.3-JL'. echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit 0 ;; + exit ;; sun3*:SunOS:*:*) echo m68k-sun-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; sun*:*:4.2BSD:*) - UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) @@ -185,52 +362,63 @@ echo sparc-sun-sunos${UNAME_RELEASE} ;; esac - exit 0 ;; + exit ;; aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} - exit 0 ;; - atari*:NetBSD:*:*) - echo m68k-atari-netbsd${UNAME_RELEASE} - exit 0 ;; - atari*:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3*:NetBSD:*:*) - echo m68k-sun-netbsd${UNAME_RELEASE} - exit 0 ;; - sun3*:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:NetBSD:*:*) - echo m68k-apple-netbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not + # "atarist" or "atariste" at least should have a processor + # > m68000). The system name ranges from "MiNT" over "FreeMiNT" + # to the lowercase version "mint" (or "freemint"). Finally + # the system name "TOS" denotes a system which is actually not + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} - exit 0 ;; + exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 - exit 0 ;; + exit ;; RISC*:ULTRIX:*:*) echo mips-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; VAX*:ULTRIX*:*:*) echo vax-dec-ultrix${UNAME_RELEASE} - exit 0 ;; - 2020:CLIX:*:*) + exit ;; + 2020:CLIX:*:* | 2430:CLIX:*:*) echo clipper-intergraph-clix${UNAME_RELEASE} - exit 0 ;; + exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) - sed 's/^ //' << EOF >dummy.c - int main (argc, argv) int argc; char **argv; { + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +#ifdef __cplusplus +#include /* for printf() prototype */ + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif #if defined (host_mips) && defined (MIPSEB) #if defined (SYSTYPE_SYSV) printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); @@ -245,62 +433,83 @@ exit (-1); } EOF - ${CC-cc} dummy.c -o dummy \ - && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } echo mips-mips-riscos${UNAME_RELEASE} - exit 0 ;; + exit ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax + exit ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax + exit ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax + exit ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix - exit 0 ;; + exit ;; m88k:CX/UX:7*:*) echo m88k-harris-cxux7 - exit 0 ;; + exit ;; m88k:*:4*:R4*) echo m88k-motorola-sysv4 - exit 0 ;; + exit ;; m88k:*:3*:R3*) echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \ - -o ${TARGET_BINARY_INTERFACE}x = x ] ; then + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ + [ ${TARGET_BINARY_INTERFACE}x = x ] + then echo m88k-dg-dgux${UNAME_RELEASE} - else + else echo m88k-dg-dguxbcs${UNAME_RELEASE} + fi + else + echo i586-dg-dgux${UNAME_RELEASE} fi - else echo i586-dg-dgux${UNAME_RELEASE} - fi - exit 0 ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 - exit 0 ;; + exit ;; M88*:*:R3*:*) # Delta 88k system running SVR3 echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) echo m88k-tektronix-sysv3 - exit 0 ;; + exit ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) echo m68k-tektronix-bsd - exit 0 ;; + exit ;; *:IRIX*:*:*) echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit 0 ;; + exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i?86:AIX:*:*) + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i*86:AIX:*:*) echo i386-ibm-aix - exit 0 ;; + exit ;; + ia64:AIX:*:*) + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - sed 's/^ //' << EOF >dummy.c + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c #include main() @@ -311,17 +520,21 @@ exit(0); } EOF - ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy - echo rs6000-ibm-aix3.2.5 + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 else echo rs6000-ibm-aix3.2 fi - exit 0 ;; - *:AIX:*:4) - if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then + exit ;; + *:AIX:*:[45]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else IBM_ARCH=powerpc @@ -329,43 +542,120 @@ if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` else - IBM_REV=4.${UNAME_RELEASE} + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:*:*) echo rs6000-ibm-aix - exit 0 ;; + exit ;; ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 - exit 0 ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC NetBSD and + exit ;; + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit 0 ;; # report: romp-ibm BSD 4.3 + exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx - exit 0 ;; + exit ;; DPX/2?00:B.O.S.:*:*) echo m68k-bull-sysv3 - exit 0 ;; + exit ;; 9000/[34]??:4.3bsd:1.*:*) echo m68k-hp-bsd - exit 0 ;; + exit ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 - exit 0 ;; - 9000/[3478]??:HP-UX:*:*) + exit ;; + 9000/[34678]??:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in 9000/31? ) HP_ARCH=m68000 ;; 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/7?? | 9000/8?[1679] ) HP_ARCH=hppa1.1 ;; - 9000/8?? ) HP_ARCH=hppa1.0 ;; + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + esac ;; + esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } +EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa + fi ;; esac - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + if [ ${HP_ARCH} = "hppa2.0w" ] + then + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep __LP64__ >/dev/null + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux${HPUX_REV} + exit ;; 3050*:HI-UX:*:*) - sed 's/^ //' << EOF >dummy.c + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c #include int main () @@ -390,324 +680,481 @@ exit (0); } EOF - ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 - exit 0 ;; + exit ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) echo hppa1.1-hp-bsd - exit 0 ;; + exit ;; 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd - exit 0 ;; + exit ;; + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) + echo hppa1.0-hp-mpeix + exit ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf - exit 0 ;; + exit ;; hp8??:OSF1:*:*) echo hppa1.0-hp-osf - exit 0 ;; - i?86:OSF1:*:*) + exit ;; + i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then echo ${UNAME_MACHINE}-unknown-osf1mk else echo ${UNAME_MACHINE}-unknown-osf1 fi - exit 0 ;; + exit ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites - exit 0 ;; + exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit 0 ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit 0 ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit 0 ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit 0 ;; - CRAY*X-MP:*:*:*) - echo xmp-cray-unicos - exit 0 ;; + exit ;; CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} - exit 0 ;; + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ - exit 0 ;; + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' + exit ;; CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} - exit 0 ;; - CRAY-2:*:*:*) - echo cray2-cray-unicos - exit 0 ;; - F300:UNIX_System_V:*:*) - FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'` + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*T3E:*:*:*) + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*SV1:*:*:*) + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + *:UNICOS/mp:*:*) + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; - F301:UNIX_System_V:*:*) - echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'` - exit 0 ;; - hp3[0-9][05]:NetBSD:*:*) - echo m68k-hp-netbsd${UNAME_RELEASE} - exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - i?86:BSD/386:*:* | *:BSD/OS:*:*) + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; + sparc*:BSD/OS:*:*) + echo sparc-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit ;; *:FreeBSD:*:*) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; - *:NetBSD:*:*) - echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - exit 0 ;; - *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - exit 0 ;; + case ${UNAME_MACHINE} in + pc98) + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; i*:CYGWIN*:*) - echo i386-pc-cygwin32 - exit 0 ;; - i*:MINGW*:*) - echo i386-pc-mingw32 - exit 0 ;; + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we + # UNAME_MACHINE based on the output of uname instead of i386? + echo i586-pc-interix + exit ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin32 - exit 0 ;; + echo powerpcle-unknown-cygwin + exit ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; *:GNU:*:*) + # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit 0 ;; - *:Linux:*:*) + exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + exit ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; + arm*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + cris:Linux:*:*) + echo cris-axis-linux-gnu + exit ;; + crisv32:Linux:*:*) + echo crisv32-axis-linux-gnu + exit ;; + frv:Linux:*:*) + echo frv-unknown-linux-gnu + exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + mips:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips + #undef mipsel + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mipsel + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips + #else + CPU= + #endif + #endif +EOF + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips64 + #undef mips64el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mips64el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips64 + #else + CPU= + #endif + #endif +EOF + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + or32:Linux:*:*) + echo or32-unknown-linux-gnu + exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-gnu + exit ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu + exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in + PA7*) echo hppa1.1-unknown-linux-gnu ;; + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; + esac + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-gnu + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux + exit ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; + x86_64:Linux:*:*) + echo x86_64-unknown-linux-gnu + exit ;; + xtensa:Linux:*:*) + echo xtensa-unknown-linux-gnu + exit ;; + i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so - # first see if it will tell us. - ld_help_string=`ld --help 2>&1` - ld_supported_emulations=`echo $ld_help_string \ - | sed -ne '/supported emulations:/!d + # first see if it will tell us. cd to the root directory to prevent + # problems with other programs or directories called `ld' in the path. + # Set LC_ALL=C to ensure ld outputs messages in English. + ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ + | sed -ne '/supported targets:/!d s/[ ][ ]*/ /g - s/.*supported emulations: *// + s/.*supported targets: *// s/ .*// p'` - case "$ld_supported_emulations" in - i?86linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 ;; - i?86coff) echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 ;; - sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; - m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; - elf32ppc) echo "powerpc-unknown-linux-gnu" ; exit 0 ;; - esac - - if test "${UNAME_MACHINE}" = "alpha" ; then - sed 's/^ //' <dummy.s - .globl main - .ent main - main: - .frame \$30,0,\$26,0 - .prologue 0 - .long 0x47e03d80 # implver $0 - lda \$2,259 - .long 0x47e20c21 # amask $2,$1 - srl \$1,8,\$2 - sll \$2,2,\$2 - sll \$0,3,\$0 - addl \$1,\$0,\$0 - addl \$2,\$0,\$0 - ret \$31,(\$26),1 - .end main -EOF - LIBC="" - ${CC-cc} dummy.s -o dummy 2>/dev/null - if test "$?" = 0 ; then - ./dummy - case "$?" in - 7) - UNAME_MACHINE="alpha" - ;; - 15) - UNAME_MACHINE="alphaev5" - ;; - 14) - UNAME_MACHINE="alphaev56" - ;; - 10) - UNAME_MACHINE="alphapca56" - ;; - 16) - UNAME_MACHINE="alphaev6" - ;; - esac - - objdump --private-headers dummy | \ - grep ld.so.1 > /dev/null - if test "$?" = 0 ; then - LIBC="libc1" - fi - fi - rm -f dummy.s dummy - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0 - elif test "${UNAME_MACHINE}" = "mips" ; then - cat >dummy.c </dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy - else - # Either a pre-BFD a.out linker (linux-gnuoldld) - # or one that does not give us useful --help. - # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout. - # If ld does not provide *any* "supported emulations:" - # that means it is gnuoldld. - echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:" - test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0 - - case "${UNAME_MACHINE}" in - i?86) - VENDOR=pc; - ;; - *) - VENDOR=unknown; - ;; - esac - # Determine whether the default compiler is a.out or elf - cat >dummy.c < -main(argc, argv) - int argc; - char *argv[]; -{ -#ifdef __ELF__ -# ifdef __GLIBC__ -# if __GLIBC__ >= 2 - printf ("%s-${VENDOR}-linux-gnu\n", argv[1]); -# else - printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]); -# endif -# else - printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]); -# endif -#else - printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]); -#endif - return 0; -} + case "$ld_supported_targets" in + elf32-i386) + TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" + ;; + a.out-i386-linux) + echo "${UNAME_MACHINE}-pc-linux-gnuaout" + exit ;; + coff-i386) + echo "${UNAME_MACHINE}-pc-linux-gnucoff" + exit ;; + "") + # Either a pre-BFD a.out linker (linux-gnuoldld) or + # one that does not give us useful --help. + echo "${UNAME_MACHINE}-pc-linux-gnuoldld" + exit ;; + esac + # Determine whether the default compiler is a.out or elf + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + #ifdef __ELF__ + # ifdef __GLIBC__ + # if __GLIBC__ >= 2 + LIBC=gnu + # else + LIBC=gnulibc1 + # endif + # else + LIBC=gnulibc1 + # endif + #else + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) + LIBC=gnu + #else + LIBC=gnuaout + #endif + #endif + #ifdef __dietlibc__ + LIBC=dietlibc + #endif EOF - ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy - fi ;; -# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions -# are messed up and put the nodename in both sysname and nodename. - i?86:DYNIX/ptx:4*:*) + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^LIBC/{ + s: ::g + p + }'`" + test x"${LIBC}" != x && { + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit + } + test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } + ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. echo i386-sequent-sysv4 - exit 0 ;; - i?86:UNIX_SV:4.2MP:2.*) + exit ;; + i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit 0 ;; - i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*) + exit ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit ;; + i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE} + echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi - exit 0 ;; - i?86:*:3.2:*) + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + exit ;; + i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` - (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ + && UNAME_MACHINE=i686 + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ + && UNAME_MACHINE=i686 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL else echo ${UNAME_MACHINE}-pc-sysv32 fi - exit 0 ;; + exit ;; pc:*:*:*) + # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i386. echo i386-pc-msdosdjgpp - exit 0 ;; + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 - exit 0 ;; + exit ;; paragon:*:*:*) echo i860-intel-osf1 - exit 0 ;; + exit ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 fi - exit 0 ;; + exit ;; mini*:CTIX:SYS*5:*) # "miniframe" echo m68010-convergent-sysv - exit 0 ;; - M68*:*:R3V[567]*:*) - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) + exit ;; + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv + exit ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix + exit ;; + M68*:*:R3V[5678]*:*) + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4.3${OS_REL} && exit 0 + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4 && exit 0 ;; - m68*:LynxOS:2.*:*) + && { echo i486-ncr-sysv4; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 - exit 0 ;; - i?86:LynxOS:2.*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*) + exit ;; + rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} - exit 0 ;; + exit ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 + exit ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` @@ -715,39 +1162,165 @@ else echo ns32k-sni-sysv fi - exit 0 ;; - PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says + exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says echo i586-unisys-sysv4 - exit 0 ;; + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm echo hppa1.1-stratus-sysv4 - exit 0 ;; + exit ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. echo i860-stratus-sysv4 - exit 0 ;; + exit ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit ;; + *:VOS:*:*) + # From Paul.Green@stratus.com. + echo hppa1.1-stratus-vos + exit ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} - exit 0 ;; - news*:NEWS-OS:*:6*) + exit ;; + news*:NEWS-OS:6*:*) echo mips-sony-newsos6 - exit 0 ;; - R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:*) + exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else echo mips-unknown-sysv${UNAME_RELEASE} fi - exit 0 ;; + exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + echo powerpc-apple-beos + exit ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; + SX-5:SUPER-UX:*:*) + echo sx5-nec-superux${UNAME_RELEASE} + exit ;; + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} + exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Rhapsody:*:*) + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in + unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + exit ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then + UNAME_PROCESSOR=i386 + UNAME_MACHINE=pc + fi + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + exit ;; + *:QNX:*:4*) + echo i386-pc-qnx + exit ;; + NSE-?:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} + exit ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux + exit ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv + exit ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + exit ;; + *:Plan9:*:*) + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 + # operating systems. + if test "$cputype" = "386"; then + UNAME_MACHINE=i386 + else + UNAME_MACHINE="$cputype" + fi + echo ${UNAME_MACHINE}-unknown-plan9 + exit ;; + *:TOPS-10:*:*) + echo pdp10-unknown-tops10 + exit ;; + *:TENEX:*:*) + echo pdp10-unknown-tenex + exit ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 + exit ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + echo pdp10-xkl-tops20 + exit ;; + *:TOPS-20:*:*) + echo pdp10-unknown-tops20 + exit ;; + *:ITS:*:*) + echo pdp10-unknown-its + exit ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 -cat >dummy.c <$dummy.c < # include @@ -772,7 +1345,7 @@ #endif #if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix"); exit (0); + printf ("arm-acorn-riscix\n"); exit (0); #endif #if defined (hp300) && !defined (hpux) @@ -785,7 +1358,10 @@ #endif int version; version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + else + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); exit (0); #endif @@ -830,11 +1406,24 @@ #endif #if defined (vax) -#if !defined (ultrix) - printf ("vax-dec-bsd\n"); exit (0); -#else - printf ("vax-dec-ultrix\n"); exit (0); -#endif +# if !defined (ultrix) +# include +# if defined (BSD) +# if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +# else +# if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# endif +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# else + printf ("vax-dec-ultrix\n"); exit (0); +# endif #endif #if defined (alliant) && defined (i860) @@ -845,12 +1434,12 @@ } EOF -${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0 -rm -f dummy.c dummy +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } # Apollos put the system type in the environment. -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } # Convex versions that predate uname can use getsysinfo(1) @@ -859,25 +1448,69 @@ case `getsysinfo -f cpu_type` in c1*) echo c1-convex-bsd - exit 0 ;; + exit ;; c2*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; c34*) echo c34-convex-bsd - exit 0 ;; + exit ;; c38*) echo c38-convex-bsd - exit 0 ;; + exit ;; c4*) echo c4-convex-bsd - exit 0 ;; + exit ;; esac fi -#echo '(Unable to guess system type)' 1>&2 +cat >&2 < in order to provide the needed +information to handle your system. + +config.guess timestamp = $timestamp + +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null` + +hostinfo = `(hostinfo) 2>/dev/null` +/bin/universe = `(/bin/universe) 2>/dev/null` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` +/bin/arch = `(/bin/arch) 2>/dev/null` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` + +UNAME_MACHINE = ${UNAME_MACHINE} +UNAME_RELEASE = ${UNAME_RELEASE} +UNAME_SYSTEM = ${UNAME_SYSTEM} +UNAME_VERSION = ${UNAME_VERSION} +EOF exit 1 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: --- xdb-1.2.0.orig/debian/changelog +++ xdb-1.2.0/debian/changelog @@ -0,0 +1,65 @@ +xdb (1.2.0-7.2) unstable; urgency=medium + + * Non-maintainer upload. + * Bump debhelper compat level to 6 (Closes: #463845). + + -- Luk Claes Sun, 03 Feb 2008 23:59:51 +0000 + +xdb (1.2.0-7.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix call of dh_shlibdeps to fix build failure (Closes: #453798). + * Add support for GNU/kFreeBSD (Closes: #399166). + * Don't use pre-iso C++ headers (Closes: #461713). + + -- Luk Claes Sat, 02 Feb 2008 16:37:59 +0000 + +xdb (1.2.0-7) unstable; urgency=low + + * xdb/ndx.h: make it build with g++ 4.1 (thanks to Martin Michlmayr + for the patch, closes: #356322) + * debian/rules: use autotools-dev to keep config.{sub,guess} + up-to-date (closes: #342441) + + -- Michael Vogt Wed, 10 May 2006 09:52:26 +0200 + +xdb (1.2.0-6) unstable; urgency=low + + * patch applied by Philipp Hug: C++ 'c2' transition (Closes: #332835) + * fix FTBFS on ppc64, thanks to Andreas Jochens (closes: #299380) + + -- Michael Vogt Fri, 2 Dec 2005 10:05:57 +0100 + +xdb (1.2.0-5) unstable; urgency=low + + * rebuild for g++-3.2 + + -- Michael Vogt Tue, 14 Jan 2003 16:44:34 +0100 + +xdb (1.2.0-4) unstable; urgency=low + + * new version of config.gues (closes: #96607) + + -- Michael Vogt Mon, 7 May 2001 10:38:44 +0200 + +xdb (1.2.0-3) unstable; urgency=low + + * new version for config.sub to make it compile on arm + closes: #90222 + + -- Michael Vogt Mon, 16 Apr 2001 21:54:31 +0200 + +xdb (1.2.0-2) unstable; urgency=low + + * new debian maintainer, closes: #88240 + * added build-depends + + -- Michael Vogt Thu, 12 Apr 2001 12:09:39 +0200 + +xdb (1.2.0-1) unstable; urgency=low + + * Initial Release. + + -- Ionutz Borcoman Thu, 10 Aug 2000 12:08:53 +0900 + + --- xdb-1.2.0.orig/debian/copyright +++ xdb-1.2.0/debian/copyright @@ -0,0 +1,12 @@ +This package was debianized by: + Ionutz Borcoman on + Thu, 10 Aug 2000 12:08:53 +0900. + +It was downloaded from: + http://xdb.sourceforge.net/ + +Upstream Authors: + please see the original AUTHORS file. + +Copyright: + LGPL (see /usr/share/common-licenses/LGPL) --- xdb-1.2.0.orig/debian/compat +++ xdb-1.2.0/debian/compat @@ -0,0 +1 @@ +6 --- xdb-1.2.0.orig/debian/rules +++ xdb-1.2.0/debian/rules @@ -0,0 +1,114 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +build: build-stamp +build-stamp: + dh_testdir + ./configure --prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --enable-static + # Add here commands to compile the package. + $(MAKE) + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp install-stamp + # Add here commands to clean up after the build process. + -$(MAKE) distclean + # update the config.sub,guess + -test -r /usr/share/misc/config.sub && \ + cp -f /usr/share/misc/config.sub config.sub + -test -r /usr/share/misc/config.guess && \ + cp -f /usr/share/misc/config.guess config.guess + + find . -name '*.o' -o -name '_libs' -o -name '*.lo' -o -name '*.a' -o -name '.deps' | xargs rm -rf + dh_clean + +install: install-stamp +install-stamp: build + dh_testdir + dh_testroot + dh_clean + $(MAKE) prefix=`pwd`/debian/tmp/usr mandir=`pwd`/debian/tmp/usr/share/man install + touch install-stamp + + +# Build architecture-independent files here. +binary-indep: +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install libxdb-dev libxdb1 + +libxdb1: build install + dh_testdir -plibxdb1 + dh_testroot -plibxdb1 + dh_installdirs -plibxdb1 + dh_install -plibxdb1 + dh_installdocs -plibxdb1 +# dh_undocumented + dh_installchangelogs -plibxdb1 ChangeLog + dh_link -plibxdb1 + dh_strip -plibxdb1 + dh_compress -plibxdb1 + dh_fixperms -plibxdb1 + dh_installdeb -plibxdb1 + dh_shlibdeps -plibxdb1 + dh_gencontrol -plibxdb1 + dh_makeshlibs -plibxdb1 + dh_md5sums -plibxdb1 + dh_builddeb -plibxdb1 + +libxdb-dev: build install libxdb1 + dh_testdir -plibxdb-dev + dh_testroot -plibxdb-dev +# dh_clean -v -plibxdb-dev -k + dh_installdirs -plibxdb-dev + dh_install -plibxdb-dev + + # copy the examples + install -d \ + debian/libxdb-dev/usr/share/doc/libxdb-dev/examples + cp examples/Makefile.am examples/*.cpp \ + debian/libxdb-dev/usr/share/doc/libxdb-dev/examples + + # copy xbase documentation + install -d \ + debian/libxdb-dev/usr/share/doc/libxdb-dev/html + cp html/*.html html/*.jpg html/*.gif html/cvsdoc \ + debian/libxdb-dev/usr/share/doc/libxdb-dev/html + + dh_installdocs -plibxdb-dev + + dh_undocumented -plibxdb-dev checkndx.1 \ + copydbf.1 \ + dbfutil1.1 \ + deletall.1 \ + checkndx.1 \ + dumphdr.1 \ + dumprecs.1 \ + packdbf.1 \ + reindex.1 \ + undelall.1 \ + zap.1 + + dh_installchangelogs -plibxdb-dev ChangeLog + dh_link -plibxdb-dev + dh_strip -plibxdb-dev + dh_compress -plibxdb-dev + dh_fixperms -plibxdb-dev + dh_installdeb -plibxdb-dev + dh_shlibdeps -plibxdb-dev -Llibxdb1 -ldebian/libxdb1/usr/lib + dh_gencontrol -plibxdb-dev + dh_makeshlibs -plibxdb-dev -V + dh_md5sums -plibxdb-dev + dh_builddeb -plibxdb-dev + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- xdb-1.2.0.orig/debian/docs +++ xdb-1.2.0/debian/docs @@ -0,0 +1,3 @@ +NEWS +README +TODO --- xdb-1.2.0.orig/debian/libxdb1.postinst +++ xdb-1.2.0/debian/libxdb1.postinst @@ -0,0 +1,8 @@ +#!/bin/sh + + +if [ "$1" = "configure" ]; then + ldconfig +fi + +#DEBHELPER# \ No newline at end of file --- xdb-1.2.0.orig/debian/control +++ xdb-1.2.0/debian/control @@ -0,0 +1,35 @@ +Source: xdb +Priority: optional +Maintainer: Michael Vogt +Standards-Version: 3.6.2 +Build-Depends: debhelper (>= 6), autotools-dev +Section: libs + +Package: libxdb1 +Section: libs +Architecture: any +Depends: ${shlibs:Depends} +Conflicts: libxdb, libxdb1c102 +Replaces: libxdb1c102 +Description: xbase compatible C++ class library + XDB is an xbase (i.e. dBase, FoxPro, etc.) compatible C++ class library + originally based on the xBase library (version 1.8.1) by Gary Kunkel and + others (see the AUTHORS file). + . + XDB was forked off from the xBase library because the original authors + are busy working on other things and we wanted to make our changes and + bugfixes available to others who might be interested. + . + XDB is useful for accessing data in legacy dBase 3 and 4 database files as + well as a general light-weight database engine. It includes support for + DBF (dBase version 3 and 4) data files, NDX and NTX indexes, and DBT + (dBase version 3 and 4). It supports file and record locking under *nix + OS's (we hope to fix the locking support under Win32 soon). + +Package: libxdb-dev +Section: devel +Architecture: any +Depends: libxdb1 (= ${Source-Version}), libc6-dev +Description: xbase compatible C++ class library + This package contains development files for xdb, utilities + and documentation distributed with xdb. --- xdb-1.2.0.orig/debian/libxdb-dev.install +++ xdb-1.2.0/debian/libxdb-dev.install @@ -0,0 +1,3 @@ +debian/tmp/usr/lib/lib*{.la,.so,.a} usr/lib +debian/tmp/usr/include/* usr/include +debian/tmp/usr/bin/* usr/bin --- xdb-1.2.0.orig/debian/libxdb1.install +++ xdb-1.2.0/debian/libxdb1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/*.so.* usr/lib --- xdb-1.2.0.orig/debian/dirs +++ xdb-1.2.0/debian/dirs @@ -0,0 +1,3 @@ +usr/bin +usr/lib +usr/include/xdb --- xdb-1.2.0.orig/config.sub +++ xdb-1.2.0/config.sub @@ -1,6 +1,11 @@ #! /bin/sh -# Configuration validation subroutine script, version 1.1. -# Copyright (C) 1991, 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc. +# Configuration validation subroutine script. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. + +timestamp='2007-06-28' + # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software # can handle that machine. It does not imply ALL GNU software can. @@ -17,14 +22,18 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. - +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. +# # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. + +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. +# # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. # If it is invalid, we print an error message on stderr and exit with code 1. @@ -45,30 +54,75 @@ # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM # It is wrong to echo any other type of specification. -if [ x$1 = x ] -then - echo Configuration name missing. 1>&2 - echo "Usage: $0 CPU-MFR-OPSYS" 1>&2 - echo "or $0 ALIAS" 1>&2 - echo where ALIAS is a recognized configuration type. 1>&2 - exit 1 -fi +me=`echo "$0" | sed -e 's,.*/,,'` -# First pass through any local machine types. -case $1 in - *local*) - echo $1 - exit 0 - ;; - *) - ;; +usage="\ +Usage: $0 [OPTION] CPU-MFR-OPSYS + $0 [OPTION] ALIAS + +Canonicalize a configuration name. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.sub ($timestamp) + +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" + exit 1 ;; + + *local*) + # First pass through any local machine types. + echo $1 + exit ;; + + * ) + break ;; + esac +done + +case $# in + 0) echo "$me: missing argument$help" >&2 + exit 1;; + 1) ;; + *) echo "$me: too many arguments$help" >&2 + exit 1;; esac # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - linux-gnu*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -94,15 +148,37 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple) + -apple | -axis | -knuth | -cray) + os= + basic_machine=$1 + ;; + -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 ;; + -scout) + ;; + -wrs) + os=-vxworks + basic_machine=$1 + ;; + -chorusos*) + os=-chorusos + basic_machine=$1 + ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; -hiux*) os=-hiuxwe2 ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco5) - os=sco3.2v5 + os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; -sco4) @@ -117,10 +193,17 @@ # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco*) os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -udk*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -isc) os=-isc2.2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -143,26 +226,84 @@ -psos*) os=-psos ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; esac # Decode aliases for certain CPU-COMPANY combinations. case $basic_machine in # Recognize the basic CPU types without company name. # Some are omitted here because they have special meanings below. - tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \ - | arme[lb] | pyramid | mn10200 | mn10300 \ - | tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \ - | alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \ - | i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \ - | mips64 | mipsel | mips64el | mips64orion | mips64orionel \ - | mipstx39 | mipstx39el \ - | sparc | sparclet | sparclite | sparc64 | v850) + 1750a | 580 \ + | a29k \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ + | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore | mep \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64vr | mips64vrel \ + | mips64orion | mips64orionel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | mt \ + | msp430 \ + | nios | nios2 \ + | ns16k | ns32k \ + | or32 \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | pyramid \ + | score \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ + | v850 | v850e \ + | we32k \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | z8k) basic_machine=$basic_machine-unknown ;; + m6811 | m68hc11 | m6812 | m68hc12) + # Motorola 68HC11/12. + basic_machine=$basic_machine-unknown + os=-none + ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + ;; + ms1) + basic_machine=mt-unknown + ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. - i[3456]86) + i*86 | x86_64) basic_machine=$basic_machine-pc ;; # Object if more than one company name word. @@ -171,27 +312,90 @@ exit 1 ;; # Recognize the basic CPU types with company name. - vax-* | tahoe-* | i[3456]86-* | i860-* | m32r-* | m68k-* | m68000-* \ - | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \ - | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ - | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \ - | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* \ - | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \ - | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \ - | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \ - | sparc64-* | mips64-* | mipsel-* \ - | mips64el-* | mips64orion-* | mips64orionel-* \ - | mipstx39-* | mipstx39el-* \ - | f301-*) + 580-* \ + | a29k-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | maxq-* | mcore-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ + | msp430-* \ + | nios-* | nios2-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | pyramid-* \ + | romp-* | rs6000-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tron-* \ + | v850-* | v850e-* | vax-* \ + | we32k-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa-* \ + | ymp-* \ + | z8k-*) ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. + 386bsd) + basic_machine=i386-unknown + os=-bsd + ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) basic_machine=m68000-att ;; 3b*) basic_machine=we32k-att ;; + a29khif) + basic_machine=a29k-amd + os=-udi + ;; + abacus) + basic_machine=abacus-unknown + ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout + ;; alliant | fx80) basic_machine=fx80-alliant ;; @@ -202,25 +406,35 @@ basic_machine=a29k-none os=-bsd ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; amdahl) basic_machine=580-amdahl os=-sysv ;; amiga | amiga-*) - basic_machine=m68k-cbm + basic_machine=m68k-unknown ;; amigaos | amigados) - basic_machine=m68k-cbm + basic_machine=m68k-unknown os=-amigaos ;; amigaunix | amix) - basic_machine=m68k-cbm + basic_machine=m68k-unknown os=-sysv4 ;; apollo68) basic_machine=m68k-apollo os=-sysv ;; + apollo68bsd) + basic_machine=m68k-apollo + os=-bsd + ;; aux) basic_machine=m68k-apple os=-aux @@ -229,6 +443,10 @@ basic_machine=ns32k-sequent os=-dynix ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -249,27 +467,45 @@ basic_machine=c38-convex os=-bsd ;; - cray | ymp) - basic_machine=ymp-cray + cray | j90) + basic_machine=j90-cray os=-unicos ;; - cray2) - basic_machine=cray2-cray - os=-unicos - ;; - [ctj]90-cray) - basic_machine=c90-cray - os=-unicos + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16) + basic_machine=cr16-unknown + os=-elf ;; crds | unos) basic_machine=m68k-crds ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; da30 | da30-*) basic_machine=m68k-da30 ;; decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) basic_machine=mips-dec ;; + decsystem10* | dec10*) + basic_machine=pdp10-dec + os=-tops10 + ;; + decsystem20* | dec20*) + basic_machine=pdp10-dec + os=-tops20 + ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) basic_machine=m68k-motorola @@ -278,6 +514,10 @@ basic_machine=m88k-motorola os=-sysv3 ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx @@ -297,6 +537,10 @@ encore | umax | mmax) basic_machine=ns32k-encore ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=-ose + ;; fx2800) basic_machine=i860-alliant ;; @@ -307,6 +551,10 @@ basic_machine=tron-gmicro os=-sysv ;; + go32) + basic_machine=i386-pc + os=-go32 + ;; h3050r* | hiux*) basic_machine=hppa1.1-hitachi os=-hiuxwe2 @@ -315,6 +563,14 @@ basic_machine=h8300-hitachi os=-hms ;; + h8300xray) + basic_machine=h8300-hitachi + os=-xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=-hms + ;; harris) basic_machine=m88k-harris os=-sysv3 @@ -330,13 +586,30 @@ basic_machine=m68k-hp os=-hpux ;; + hp3k9[0-9][0-9] | hp9[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; hp9k2[0-9][0-9] | hp9k31[0-9]) basic_machine=m68000-hp ;; hp9k3[2-9][0-9]) basic_machine=m68k-hp ;; - hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7) + hp9k6[0-9][0-9] | hp6[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k7[0-79][0-9] | hp7[0-79][0-9]) + basic_machine=hppa1.1-hp + ;; + hp9k78[0-9] | hp78[0-9]) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][13679] | hp8[0-9][13679]) basic_machine=hppa1.1-hp ;; hp9k8[0-9][0-9] | hp8[0-9][0-9]) @@ -345,27 +618,42 @@ hppa-next) os=-nextstep3 ;; + hppaosf) + basic_machine=hppa1.1-hp + os=-osf + ;; + hppro) + basic_machine=hppa1.1-hp + os=-proelf + ;; i370-ibm* | ibm*) basic_machine=i370-ibm - os=-mvs ;; # I'm not sure what "Sysv32" means. Should this be sysv3.2? - i[3456]86v32) + i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 ;; - i[3456]86v4*) + i*86v4*) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv4 ;; - i[3456]86v) + i*86v) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv ;; - i[3456]86sol2) + i*86sol2) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-solaris2 ;; + i386mach) + basic_machine=i386-mach + os=-mach + ;; + i386-vsta | vsta) + basic_machine=i386-unknown + os=-vsta + ;; iris | iris4d) basic_machine=mips-sgi case $os in @@ -391,16 +679,20 @@ basic_machine=ns32k-utek os=-sysv ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 + ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; - mipsel*-linux*) - basic_machine=mipsel-unknown - os=-linux-gnu - ;; - mips*-linux*) - basic_machine=mips-unknown - os=-linux-gnu + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) + basic_machine=m68k-atari + os=-mint ;; mips3*-*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` @@ -408,10 +700,37 @@ mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; + msdos) + basic_machine=i386-pc + os=-msdos + ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 ;; + netbsd386) + basic_machine=i386-unknown + os=-netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + os=-linux + ;; news | news700 | news800 | news900) basic_machine=m68k-sony os=-newsos @@ -424,6 +743,10 @@ basic_machine=mips-sony os=-newsos ;; + necv70) + basic_machine=v70-nec + os=-sysv + ;; next | m*-next ) basic_machine=m68k-next case $os in @@ -449,9 +772,39 @@ basic_machine=i960-intel os=-nindy ;; + mon960) + basic_machine=i960-intel + os=-mon960 + ;; + nonstopux) + basic_machine=mips-compaq + os=-nonstopux + ;; np1) basic_machine=np1-gould ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; + op50n-* | op60c-*) + basic_machine=hppa1.1-oki + os=-proelf + ;; + openrisc | openrisc-*) + basic_machine=or32-unknown + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose + ;; + os68k) + basic_machine=m68k-none + os=-os68k + ;; pa-hitachi) basic_machine=hppa1.1-hitachi os=-hiuxwe2 @@ -466,53 +819,109 @@ pbb) basic_machine=m68k-tti ;; - pc532 | pc532-*) + pc532 | pc532-*) basic_machine=ns32k-pc532 ;; - pentium | p5) - basic_machine=i586-intel + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium | p5 | k5 | k6 | nexgen | viac3) + basic_machine=i586-pc + ;; + pentiumpro | p6 | 6x86 | athlon | athlon_*) + basic_machine=i686-pc ;; - pentiumpro | p6) - basic_machine=i686-intel + pentiumii | pentium2 | pentiumiii | pentium3) + basic_machine=i686-pc ;; - pentium-* | p5-*) + pentium4) + basic_machine=i786-pc + ;; + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumpro-* | p6-*) + pentiumpro-* | p6-* | 6x86-* | athlon-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - k5) - # We don't have specific support for AMD's K5 yet, so just call it a Pentium - basic_machine=i586-amd - ;; - nexen) - # We don't have specific support for Nexgen yet, so just call it a Pentium - basic_machine=i586-nexgen + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pn) basic_machine=pn-gould ;; - power) basic_machine=rs6000-ibm + power) basic_machine=power-ibm ;; ppc) basic_machine=powerpc-unknown - ;; + ;; ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown - ;; + ;; ppcle-* | powerpclittle-*) basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` ;; + ppc64) basic_machine=powerpc64-unknown + ;; + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64le | powerpc64little | ppc64-le | powerpc64-little) + basic_machine=powerpc64le-unknown + ;; + ppc64le-* | powerpc64little-*) + basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; ps2) basic_machine=i386-ibm ;; + pw32) + basic_machine=i586-unknown + os=-pw32 + ;; + rdos) + basic_machine=i386-pc + os=-rdos + ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff + ;; rm[46]00) basic_machine=mips-siemens ;; rtpc | rtpc-*) basic_machine=romp-ibm ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; + sa29200) + basic_machine=a29k-amd + os=-udi + ;; + sb1) + basic_machine=mipsisa64sb1-unknown + ;; + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; sequent) basic_machine=i386-sequent ;; @@ -520,6 +929,16 @@ basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; + sh64) + basic_machine=sh64-unknown + ;; + sparclite-wrs | simso-wrs) + basic_machine=sparclite-wrs + os=-vxworks + ;; sps7) basic_machine=m68k-bull os=-sysv2 @@ -527,6 +946,13 @@ spur) basic_machine=spur-unknown ;; + st2000) + basic_machine=m68k-tandem + ;; + stratus) + basic_machine=i860-stratus + os=-sysv4 + ;; sun2) basic_machine=m68000-sun ;; @@ -567,19 +993,51 @@ sun386 | sun386i | roadrunner) basic_machine=i386-sun ;; + sv1) + basic_machine=sv1-cray + os=-unicos + ;; symmetry) basic_machine=i386-sequent os=-dynix ;; + t3e) + basic_machine=alphaev5-cray + os=-unicos + ;; + t90) + basic_machine=t90-cray + os=-unicos + ;; + tic54x | c54x*) + basic_machine=tic54x-unknown + os=-coff + ;; + tic55x | c55x*) + basic_machine=tic55x-unknown + os=-coff + ;; + tic6x | c6x*) + basic_machine=tic6x-unknown + os=-coff + ;; tx39) basic_machine=mipstx39-unknown ;; tx39el) basic_machine=mipstx39el-unknown ;; + toad1) + basic_machine=pdp10-xkl + os=-tops20 + ;; tower | tower-32) basic_machine=m68k-ncr ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; udi29k) basic_machine=a29k-amd os=-udi @@ -588,6 +1046,10 @@ basic_machine=a29k-nyu os=-sym1 ;; + v810 | necv810) + basic_machine=v810-nec + os=-none + ;; vaxv) basic_machine=vax-dec os=-sysv @@ -597,8 +1059,8 @@ os=-vms ;; vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; + basic_machine=f301-fujitsu + ;; vxworks960) basic_machine=i960-wrs os=-vxworks @@ -611,13 +1073,29 @@ basic_machine=a29k-wrs os=-vxworks ;; - xmp) - basic_machine=xmp-cray - os=-unicos + w65*) + basic_machine=w65-wdc + os=-none + ;; + w89k-*) + basic_machine=hppa1.1-winbond + os=-proelf + ;; + xbox) + basic_machine=i686-pc + os=-mingw32 ;; - xps | xps100) + xps | xps100) basic_machine=xps100-honeywell ;; + ymp) + basic_machine=ymp-cray + os=-unicos + ;; + z8k-*-coff) + basic_machine=z8k-unknown + os=-sim + ;; none) basic_machine=none-none os=-none @@ -625,32 +1103,44 @@ # Here we handle the default manufacturer of certain CPU types. It is in # some cases the only manufacturer, in others, it is the most popular. - mips) - if [ x$os = x-linux-gnu ]; then - basic_machine=mips-unknown - else - basic_machine=mips-mips - fi + w89k) + basic_machine=hppa1.1-winbond + ;; + op50n) + basic_machine=hppa1.1-oki + ;; + op60c) + basic_machine=hppa1.1-oki ;; romp) basic_machine=romp-ibm ;; + mmix) + basic_machine=mmix-knuth + ;; rs6000) basic_machine=rs6000-ibm ;; vax) basic_machine=vax-dec ;; + pdp10) + # there are many clones, so DEC is not a safe bet + basic_machine=pdp10-unknown + ;; pdp11) basic_machine=pdp11-dec ;; we32k) basic_machine=we32k-att ;; - sparc) + sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; - cydra) + cydra) basic_machine=cydra-cydrome ;; orion) @@ -659,6 +1149,15 @@ orion105) basic_machine=clipper-highlevel ;; + mac | mpw | mac-mpw) + basic_machine=m68k-apple + ;; + pmac | pmac-mpw) + basic_machine=powerpc-apple + ;; + *-unknown) + # Make sure to match an already-canonicalized machine name. + ;; *) echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 exit 1 @@ -711,14 +1210,49 @@ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv*) + | -chorusos* | -chorusrdb* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; + -qnx*) + case $basic_machine in + x86-* | i*86-*) + ;; + *) + os=-nto$os + ;; + esac + ;; + -nto-qnx*) + ;; + -nto*) + os=`echo $os | sed -e 's|nto|nto-qnx|'` + ;; + -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + ;; + -mac*) + os=`echo $os | sed -e 's|mac|macos|'` + ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; @@ -728,6 +1262,15 @@ -sunos6*) os=`echo $os | sed -e 's|sunos6|solaris3|'` ;; + -opened*) + os=-openedition + ;; + -os400*) + os=-os400 + ;; + -wince*) + os=-wince + ;; -osfrose*) os=-osfrose ;; @@ -743,11 +1286,26 @@ -acis*) os=-aos ;; + -atheos*) + os=-atheos + ;; + -syllable*) + os=-syllable + ;; + -386bsd) + os=-bsd + ;; -ctix* | -uts*) os=-sysv ;; + -nova*) + os=-rtmk-nova + ;; -ns2 ) - os=-nextstep2 + os=-nextstep2 + ;; + -nsk*) + os=-nsk ;; # Preserve the version number of sinix5. -sinix5.*) @@ -756,6 +1314,9 @@ -sinix*) os=-sysv4 ;; + -tpf*) + os=-tpf + ;; -triton*) os=-sysv3 ;; @@ -774,9 +1335,27 @@ # This must come after -sysvr4. -sysv*) ;; + -ose*) + os=-ose + ;; + -es1800*) + os=-ose + ;; -xenix) os=-xenix ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint + ;; + -aros*) + os=-aros + ;; + -kaos*) + os=-kaos + ;; + -zvmoe) + os=-zvmoe + ;; -none) ;; *) @@ -799,13 +1378,29 @@ # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; + arm*-rebel) + os=-linux + ;; arm*-semi) os=-aout ;; - pdp11-*) + c4x-* | tic4x-*) + os=-coff + ;; + # This must come before the *-dec entry. + pdp10-*) + os=-tops20 + ;; + pdp11-*) os=-none ;; *-dec | vax-*) @@ -823,15 +1418,48 @@ # default. # os=-sunos4 ;; + m68*-cisco) + os=-aout + ;; + mep-*) + os=-elf + ;; + mips*-cisco) + os=-elf + ;; + mips*-*) + os=-elf + ;; + or32-*) + os=-coff + ;; *-tti) # must be before sparc entry or we get the wrong os. os=-sysv3 ;; sparc-* | *-sun) os=-sunos4.1.1 ;; + *-be) + os=-beos + ;; + *-haiku) + os=-haiku + ;; *-ibm) os=-aix ;; + *-knuth) + os=-mmixware + ;; + *-wec) + os=-proelf + ;; + *-winbond) + os=-proelf + ;; + *-oki) + os=-proelf + ;; *-hp) os=-hpux ;; @@ -874,27 +1502,39 @@ *-next) os=-nextstep3 ;; - *-gould) + *-gould) os=-sysv ;; - *-highlevel) + *-highlevel) os=-bsd ;; *-encore) os=-bsd ;; - *-sgi) + *-sgi) os=-irix ;; - *-siemens) + *-siemens) os=-sysv4 ;; *-masscomp) os=-rtu ;; - f301-fujitsu) + f30[01]-fujitsu | f700-fujitsu) os=-uxpv ;; + *-rom68k) + os=-coff + ;; + *-*bug) + os=-coff + ;; + *-apple) + os=-macos + ;; + *-atari*) + os=-mint + ;; *) os=-none ;; @@ -916,9 +1556,15 @@ -aix*) vendor=ibm ;; + -beos*) + vendor=be + ;; -hpux*) vendor=hp ;; + -mpeix*) + vendor=hp + ;; -hiux*) vendor=hitachi ;; @@ -934,21 +1580,47 @@ -genix*) vendor=ns ;; - -mvs*) + -mvs* | -opened*) + vendor=ibm + ;; + -os400*) vendor=ibm ;; -ptx*) vendor=sequent ;; - -vxsim* | -vxworks*) + -tpf*) + vendor=ibm + ;; + -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; -aux*) vendor=apple ;; + -hms*) + vendor=hitachi + ;; + -mpw* | -macos*) + vendor=apple + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + vendor=atari + ;; + -vos*) + vendor=stratus + ;; esac basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` ;; esac echo $basic_machine$os +exit + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: --- xdb-1.2.0.orig/ltconfig +++ xdb-1.2.0/ltconfig @@ -1656,7 +1656,7 @@ ;; # This must be Linux ELF. -linux-gnu*) +linux-gnu*|kfreebsd*-gnu) version_type=linux library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' soname_spec='${libname}${release}.so$major' --- xdb-1.2.0.orig/examples/indextst.cpp +++ xdb-1.2.0/examples/indextst.cpp @@ -39,7 +39,7 @@ extern unsigned _stklen = 100000; #endif -main() +int main() { xbShort f1, f2, f3, rc, sts = 0; char charbuf[10]; @@ -68,10 +68,10 @@ #endif // XB_INDEX_NTX #endif // XB_INDEX_ANY - cout << "Creating test database and indices" << endl; + std::cout << "Creating test database and indices" << std::endl; if(( rc = MyFile.CreateDatabase( "IXTEST.DBF", MyRecord, XB_OVERLAY )) != XB_NO_ERROR ) - cout << "Error creating database = " << rc << "\n"; + std::cout << "Error creating database = " << rc << "\n"; else { #ifdef XB_INDEX_ANY @@ -79,21 +79,21 @@ if(( rc = indx1.CreateIndex( "IXNDX1.NDX", "CHARFLD1", XB_NOT_UNIQUE, XB_OVERLAY )) != XB_NO_ERROR ) { - cout << "Error creating index 1 = " << rc << endl; + std::cout << "Error creating index 1 = " << rc << std::endl; exit( 1 ); } if(( rc = indx2.CreateIndex( "IXNDX2.NDX", "CHARFLD1+CHARFLD2", XB_NOT_UNIQUE, XB_OVERLAY )) != XB_NO_ERROR ) { - cout << "Error creating index 2 = " << rc << endl; + std::cout << "Error creating index 2 = " << rc << std::endl; exit( 1 ); } if(( rc = indx3.CreateIndex( "IXNDX3.NDX", "NUMFLD1", XB_NOT_UNIQUE, XB_OVERLAY )) != XB_NO_ERROR ) { - cout << "Error creating index 3 = " << rc << endl; + std::cout << "Error creating index 3 = " << rc << std::endl; exit( 1 ); } #endif // XB_INDEX_NDX @@ -102,21 +102,21 @@ if(( rc = intx1.CreateIndex( "IXNTX1.NTX", "CHARFLD1", XB_NOT_UNIQUE, XB_OVERLAY )) != XB_NO_ERROR ) { - cout << "Error creating index 4 = " << rc << endl; + std::cout << "Error creating index 4 = " << rc << std::endl; exit( 1 ); } if(( rc = intx2.CreateIndex( "IXNTX2.NTX", "CHARFLD1+CHARFLD2", XB_NOT_UNIQUE, XB_OVERLAY )) != XB_NO_ERROR ) { - cout << "Error creating index 5 = " << rc << endl; + std::cout << "Error creating index 5 = " << rc << std::endl; exit( 1 ); } if(( rc = intx3.CreateIndex( "IXNTX3.NTX", "NUMFLD1", XB_NOT_UNIQUE, XB_OVERLAY )) != XB_NO_ERROR ) { - cout << "Error creating index 6 = " << rc << endl; + std::cout << "Error creating index 6 = " << rc << std::endl; exit( 1 ); } #endif // XB_INDEX_NTX @@ -127,7 +127,7 @@ f2 = MyFile.GetFieldNo( "CHARFLD2" ); f3 = MyFile.GetFieldNo( "NUMFLD1" ); - cout << "Populating database and indices with data" << endl; + std::cout << "Populating database and indices with data" << std::endl; for( int i = 0; i < 1000; i++ ){ memset( charbuf, 0x00, 10 ); sprintf( charbuf, "%d", i ); @@ -140,47 +140,47 @@ #ifdef XB_INDEX_ANY #ifdef XB_INDEX_NDX - cout << "Testing NDX index 1" << endl; + std::cout << "Testing NDX index 1" << std::endl; if(( rc = indx1.CheckIndexIntegrity(0)) != XB_NO_ERROR ){ - cout << "Error " << rc << " with index indx1" << endl; + std::cout << "Error " << rc << " with index indx1" << std::endl; sts++; } - cout << "Testing NDX index 2" << endl; + std::cout << "Testing NDX index 2" << std::endl; if(( rc = indx2.CheckIndexIntegrity(0)) != XB_NO_ERROR ){ - cout << "Error " << rc << " with index indx2" << endl; + std::cout << "Error " << rc << " with index indx2" << std::endl; sts++; } - cout << "Testing NDX index 3" << endl; + std::cout << "Testing NDX index 3" << std::endl; if(( rc = indx3.CheckIndexIntegrity(0)) != XB_NO_ERROR ){ - cout << "Error " << rc << " with index indx3" << endl; + std::cout << "Error " << rc << " with index indx3" << std::endl; sts++; } #endif #ifdef XB_INDEX_NTX - cout << "Testing NTX index 1" << endl; + std::cout << "Testing NTX index 1" << std::endl; if(( rc = intx1.CheckIndexIntegrity(1)) != XB_NO_ERROR ){ - cout << "Error " << rc << " with index intx1" << endl; + std::cout << "Error " << rc << " with index intx1" << std::endl; sts++; } - cout << "Testing NTX index 2" << endl; + std::cout << "Testing NTX index 2" << std::endl; if(( rc = intx2.CheckIndexIntegrity(1)) != XB_NO_ERROR ){ - cout << "Error " << rc << " with index intx2" << endl; + std::cout << "Error " << rc << " with index intx2" << std::endl; sts++; } - cout << "Testing NTX index 3" << endl; + std::cout << "Testing NTX index 3" << std::endl; if(( rc = intx3.CheckIndexIntegrity(1)) != XB_NO_ERROR ){ - cout << "Error " << rc << " with index intx3" << endl; + std::cout << "Error " << rc << " with index intx3" << std::endl; sts++; } #endif // XB_INDEX_NTX #endif // XB_INDEX_ANY - cout << "Index testing completed" << endl; + std::cout << "Index testing completed" << std::endl; MyFile.CloseDatabase(); /* Close database and associated indexes */ return sts; } --- xdb-1.2.0.orig/examples/testhtml.cpp +++ xdb-1.2.0/examples/testhtml.cpp @@ -205,7 +205,7 @@ return 0; #else - cout << "\nXB_HTML is not compiled in\n"; + std::cout << "\nXB_HTML is not compiled in\n"; #endif return 0; } --- xdb-1.2.0.orig/examples/testdbinfo.cpp +++ xdb-1.2.0/examples/testdbinfo.cpp @@ -82,29 +82,29 @@ if(( rc = MyFile.CreateDatabase( "MYFILE.DBF", MyRecord, XB_OVERLAY )) != XB_NO_ERROR ) - cout << "\nError creating database = " << rc << "\n"; + std::cout << "\nError creating database = " << rc << "\n"; else { /* define a simple index */ #ifdef XB_INDEX_NDX if(( rc = MyIndex1.CreateIndex( "MYINDEX1.NDX", "LASTNAME", XB_NOT_UNIQUE, XB_OVERLAY )) != XB_NO_ERROR ) - cout << "\nError creating index 1 = " << rc << "\n"; + std::cout << "\nError creating index 1 = " << rc << "\n"; /* define a multi-field index "LASTNAME FIRSTNAME" */ if(( rc = MyIndex2.CreateIndex( "MYINDEX2.NDX", "LASTNAME+FIRSTNAME", XB_NOT_UNIQUE, XB_OVERLAY )) != XB_NO_ERROR ) - cout << "\nError creating index 2 = " << rc << "\n"; + std::cout << "\nError creating index 2 = " << rc << "\n"; /* define a multi-field index "LASTNAMEFIRSTNAME" */ if(( rc = MyIndex3.CreateIndex( "MYINDEX3.NDX", "LASTNAME-FIRSTNAME", XB_NOT_UNIQUE, XB_OVERLAY )) != XB_NO_ERROR ) - cout << "\nError creating index 3 = " << rc << "\n"; + std::cout << "\nError creating index 3 = " << rc << "\n"; /* define a numeric index "ZIPCODE" */ if(( rc = MyIndex4.CreateIndex( "MYINDEX4.NDX", "ZIPCODE", XB_NOT_UNIQUE, XB_OVERLAY )) != XB_NO_ERROR ) - cout << "\nError creating index 4 = " << rc << "\n"; + std::cout << "\nError creating index 4 = " << rc << "\n"; #endif // XB_INDEX_NDX } --- xdb-1.2.0.orig/examples/testdate.cpp +++ xdb-1.2.0/examples/testdate.cpp @@ -35,50 +35,50 @@ xbXBase x; long l; - cout << "This program tests the XDATE routines" << endl; + std::cout << "This program tests the XDATE routines" << std::endl; - cout << "\nThis year is " << x.YearOf ( x.Sysdate() ); - cout << "\nThis Month is " << x.MonthOf( x.Sysdate() ); - cout << "\nToday is day " << x.DayOf( XB_FMT_WEEK, x.Sysdate()) << " of the week"; - cout << "\nToday is day " << x.DayOf( XB_FMT_MONTH, x.Sysdate()) << " of the month"; - cout << "\nToday is day " << x.DayOf( XB_FMT_YEAR, x.Sysdate()) << " of the year"; + std::cout << "\nThis year is " << x.YearOf ( x.Sysdate() ); + std::cout << "\nThis Month is " << x.MonthOf( x.Sysdate() ); + std::cout << "\nToday is day " << x.DayOf( XB_FMT_WEEK, x.Sysdate()) << " of the week"; + std::cout << "\nToday is day " << x.DayOf( XB_FMT_MONTH, x.Sysdate()) << " of the month"; + std::cout << "\nToday is day " << x.DayOf( XB_FMT_YEAR, x.Sysdate()) << " of the year"; if( x.IsLeapYear( x.Sysdate())) - cout << "\nThis is a leapyear"; + std::cout << "\nThis is a leapyear"; else - cout << "\nThis is not a leap year."; + std::cout << "\nThis is not a leap year."; - cout << "\nToday is " << x.Sysdate(); + std::cout << "\nToday is " << x.Sysdate(); if( x.DateIsValid( "19951301" )) - cout << "\n19951301 is a valid date"; + std::cout << "\n19951301 is a valid date"; else - cout << "\n19951301 is not a valid date"; + std::cout << "\n19951301 is not a valid date"; l = x.JulianDays( "19951101" ) - x.JulianDays( "19951001" ); - cout << "\nThere are " << l + std::cout << "\nThere are " << l << " days between 10/1/95 and 11/1/95."; - cout << "\nIn 7 days it will be " + std::cout << "\nIn 7 days it will be " << x.JulToDate8( x.JulianDays( x.Sysdate()) + 7L ); - cout << "\nToday is " << x.CharDayOf( x.Sysdate()); - cout << "\nThis month is " << x.CharMonthOf( x.Sysdate()); + std::cout << "\nToday is " << x.CharDayOf( x.Sysdate()); + std::cout << "\nThis month is " << x.CharMonthOf( x.Sysdate()); - cout << "\nFormat (YYDDD) " << x.FormatDate( "YYDDD", x.Sysdate()); - cout << "\nFormat (MM/DD/YY) " << x.FormatDate( "MM/DD/YY", x.Sysdate()); - cout << "\nFormat (MMMM DD,YYYY) " << x.FormatDate( "MMMM DD,YYYY", x.Sysdate()); - cout << "\nFormat (DDDD, MMMM DD YYYY) " << x.FormatDate( "DDDD, MMMM DD YYYY", x.Sysdate()); - - cout << "\nDefault DateFormat is " << x.GetDefaultDateFormat(); - //cout << " " << x.DTOC( x.Sysdate() ); - cout << "\nSetting DefaultDateFormat to DD/MM/YY"; + std::cout << "\nFormat (YYDDD) " << x.FormatDate( "YYDDD", x.Sysdate()); + std::cout << "\nFormat (MM/DD/YY) " << x.FormatDate( "MM/DD/YY", x.Sysdate()); + std::cout << "\nFormat (MMMM DD,YYYY) " << x.FormatDate( "MMMM DD,YYYY", x.Sysdate()); + std::cout << "\nFormat (DDDD, MMMM DD YYYY) " << x.FormatDate( "DDDD, MMMM DD YYYY", x.Sysdate()); + + std::cout << "\nDefault DateFormat is " << x.GetDefaultDateFormat(); + //std::cout << " " << x.DTOC( x.Sysdate() ); + std::cout << "\nSetting DefaultDateFormat to DD/MM/YY"; x.SetDefaultDateFormat( "DD/MM/YY" ); - cout << "\nDefault DateFormat is now " << x.GetDefaultDateFormat(); - //cout << " " << x.DTOC( x.Sysdate() ); + std::cout << "\nDefault DateFormat is now " << x.GetDefaultDateFormat(); + //std::cout << " " << x.DTOC( x.Sysdate() ); - cout << "\n"; + std::cout << "\n"; return 0; } --- xdb-1.2.0.orig/examples/sample3.cpp +++ xdb-1.2.0/examples/sample3.cpp @@ -63,67 +63,67 @@ f1 = MyFile.GetFieldNo( "FLOAT1" ); memo = MyFile.GetFieldNo( "MEMO1" ); - cout << "\nThere are " << MyFile.FieldCount() << " fields in the file"; + std::cout << "\nThere are " << MyFile.FieldCount() << " fields in the file"; - cout << "\nSample NoOfRecs" << endl; + std::cout << "\nSample NoOfRecs" << std::endl; recs = MyFile.NoOfRecords(); - cout << "There are " << recs << " records in the file." << endl; + std::cout << "There are " << recs << " records in the file." << std::endl; - cout << "\nLASTNAME is type: " << MyFile.GetFieldType( lname ) + std::cout << "\nLASTNAME is type: " << MyFile.GetFieldType( lname ) << " length: " << MyFile.GetFieldLen( lname ); - cout << "\nFIRSTNAME is type: " << MyFile.GetFieldType( fname ) + std::cout << "\nFIRSTNAME is type: " << MyFile.GetFieldType( fname ) << " length: " << MyFile.GetFieldLen( fname ); - cout << "\nBIRTHDATE is type: " << MyFile.GetFieldType( birthdate ) + std::cout << "\nBIRTHDATE is type: " << MyFile.GetFieldType( birthdate ) << " length: " << MyFile.GetFieldLen( birthdate ); - cout << "\nAMOUNT is type: " << MyFile.GetFieldType( amount ) + std::cout << "\nAMOUNT is type: " << MyFile.GetFieldType( amount ) << " length: " << MyFile.GetFieldLen( amount ); - cout << "\nSWITCH is type: " << MyFile.GetFieldType( sw ) + std::cout << "\nSWITCH is type: " << MyFile.GetFieldType( sw ) << " length: " << MyFile.GetFieldLen( sw ) << "\n\n"; - cout << "Sample GetRecord" << endl; + std::cout << "Sample GetRecord" << std::endl; MyFile.GetRecord( 1L ); MyFile.GetField( lname, buf ); - cout << "Name 1 = " << buf << endl; + std::cout << "Name 1 = " << buf << std::endl; f = MyFile.GetFloatField( f1 ); - cout << "FLOAT1 = " << f << endl; + std::cout << "FLOAT1 = " << f << std::endl; f = MyFile.GetFloatField( "FLOAT2" ); - cout << "FLOAT2 = " << f << endl; + std::cout << "FLOAT2 = " << f << std::endl; - cout << "Sample GetRecordBuf" << endl; + std::cout << "Sample GetRecordBuf" << std::endl; p = MyFile.GetRecordBuf(); /* pointer to record buffer */ - for( i = 0; i < 49; i++ ) cout << *p++; /* display the buffer */ + for( i = 0; i < 49; i++ ) std::cout << *p++; /* display the buffer */ - cout << "\n\nLoop through forwards..." << endl; + std::cout << "\n\nLoop through forwards..." << std::endl; rc = MyFile.GetFirstRecord(); while( rc == XB_NO_ERROR ) { MyFile.GetField( lname, buf ); - cout << MyFile.GetCurRecNo(); - cout << " Name = " << buf << endl; + std::cout << MyFile.GetCurRecNo(); + std::cout << " Name = " << buf << std::endl; rc = MyFile.GetNextRecord(); #ifdef XB_MEMO_FIELDS if( MyFile.MemoFieldExists( memo )) - cout << "Memo field MEMO1 len = " << MyFile.GetMemoFieldLen(memo) << endl; + std::cout << "Memo field MEMO1 len = " << MyFile.GetMemoFieldLen(memo) << std::endl; #endif } - cout << "\n\nSample PutRecord" << endl << endl; + std::cout << "\n\nSample PutRecord" << std::endl << std::endl; MyFile.PutField( lname, "Stantonbob" ); MyFile.PutField( lname, "Sally" ); MyFile.PutRecord( MyFile.GetCurRecNo() ); - cout << "\nLoop through backwards.." << endl; + std::cout << "\nLoop through backwards.." << std::endl; rc = MyFile.GetLastRecord(); while( rc == XB_NO_ERROR ) { // MyFile.GetField( lname, buf ); - cout << "Last Name = " << MyFile.GetStringField( lname ) << endl; - cout << "Logical Field = " << MyFile.GetLogicalField( "SWITCH" ) << endl; + std::cout << "Last Name = " << MyFile.GetStringField( lname ) << std::endl; + std::cout << "Logical Field = " << MyFile.GetLogicalField( "SWITCH" ) << std::endl; rc = MyFile.GetPrevRecord(); } - cout << endl; + std::cout << std::endl; MyFile.CloseDatabase(); /* close database */ return 0; } --- xdb-1.2.0.orig/examples/sample2.cpp +++ xdb-1.2.0/examples/sample2.cpp @@ -58,13 +58,13 @@ MyFile.OpenDatabase( "MYFILE.DBF" ); #ifdef XB_INDEX_NDX if(( rc = MyIndex1.OpenIndex( "MYINDEX1.NDX" )) != XB_NO_ERROR ) - cout << "\nError opening index1 rc=" << rc; + std::cout << "\nError opening index1 rc=" << rc; if(( rc = MyIndex2.OpenIndex( "MYINDEX2.NDX" )) != XB_NO_ERROR ) - cout << "\nError opening index2 rc=" << rc; + std::cout << "\nError opening index2 rc=" << rc; if(( rc = MyIndex3.OpenIndex( "MYINDEX3.NDX" )) != XB_NO_ERROR ) - cout << "\nError opening index3 rc=" << rc; + std::cout << "\nError opening index3 rc=" << rc; if(( rc = MyIndex4.OpenIndex( "MYINDEX4.NDX" )) != XB_NO_ERROR ) - cout << "\nError opening index4 rc=" << rc; + std::cout << "\nError opening index4 rc=" << rc; #endif // XB_INDEX_NDX lname = MyFile.GetFieldNo( "LASTNAME" ); @@ -79,19 +79,19 @@ m1 = MyFile.GetFieldNo( "MEMO1" ); z = MyFile.GetFieldNo( "ZIPCODE" ); - cout << "\nLast Name Id = " << lname; - cout << "\nFirst Name Id = " << fname; - cout << "\nBirthdate Id = " << birthdate; - cout << "\nAmount Id = " << amount; - cout << "\nSwitch Id = " << sw; - cout << "\nFloat 1 Id = " << f1; - cout << "\nFloat 2 Id = " << f2; - cout << "\nFloat 3 Id = " << f3; - cout << "\nFloat 4 Id = " << f4; + std::cout << "\nLast Name Id = " << lname; + std::cout << "\nFirst Name Id = " << fname; + std::cout << "\nBirthdate Id = " << birthdate; + std::cout << "\nAmount Id = " << amount; + std::cout << "\nSwitch Id = " << sw; + std::cout << "\nFloat 1 Id = " << f1; + std::cout << "\nFloat 2 Id = " << f2; + std::cout << "\nFloat 3 Id = " << f3; + std::cout << "\nFloat 4 Id = " << f4; #ifdef XB_MEMO_FIELDS - cout << "\nMemo1 Id = " << m1; + std::cout << "\nMemo1 Id = " << m1; #endif - cout << "\nZipcode Id = " << z << "\n"; + std::cout << "\nZipcode Id = " << z << "\n"; /* build record one */ MyFile.BlankRecord(); /* blank out the record buffer */ @@ -107,7 +107,7 @@ MyFile.PutField( f4, "1" ); MyFile.PutField( z, "76262" ); if(( rc = MyFile.AppendRecord()) != XB_NO_ERROR ) /* write it */ - cout << "\nError " << rc << " appending data record."; + std::cout << "\nError " << rc << " appending data record."; /* build record two */ MyFile.BlankRecord(); /* blank out the record buffer */ @@ -128,7 +128,7 @@ MyFile.UpdateMemoData( m1, 20, "Sample memo field 2", F_SETLKW ); #endif if(( rc = MyFile.AppendRecord()) != XB_NO_ERROR ) /* write it */ - cout << "\nError " << rc << " appending data record."; + std::cout << "\nError " << rc << " appending data record."; /* build record three */ MyFile.BlankRecord(); /* blank out the record buffer */ @@ -149,7 +149,7 @@ MyFile.UpdateMemoData( m1, 20, "Sample memo field 3", F_SETLKW ); #endif if(( rc = MyFile.AppendRecord()) != XB_NO_ERROR ) /* write it */ - cout << "\nError " << rc << " appending data record."; + std::cout << "\nError " << rc << " appending data record."; /* build record four */ MyFile.BlankRecord(); /* blank out the record buffer */ @@ -170,7 +170,7 @@ MyFile.UpdateMemoData( m1, 20, "Sample memo field 4", F_SETLKW ); #endif if(( rc = MyFile.AppendRecord()) != XB_NO_ERROR ) /* write it */ - cout << "\nError " << rc << " appending data record."; + std::cout << "\nError " << rc << " appending data record."; MyFile.CloseDatabase(); /* close database */ return 0; --- xdb-1.2.0.orig/examples/sample5.cpp +++ xdb-1.2.0/examples/sample5.cpp @@ -47,38 +47,38 @@ #endif // XB_INDEX_NDX rc = d.OpenDatabase( "MYFILE" ); - cout << "OpenDatabase rc = " << rc << "\n"; + std::cout << "OpenDatabase rc = " << rc << "\n"; #ifdef XB_INDEX_NDX rc = i1.OpenIndex( "MYINDEX1" ); - cout << "OpenIndex 1 rc = " << rc << "\n"; + std::cout << "OpenIndex 1 rc = " << rc << "\n"; rc = i2.OpenIndex( "MYINDEX2" ); - cout << "OpenIndex 2 rc = " << rc << "\n"; + std::cout << "OpenIndex 2 rc = " << rc << "\n"; rc = i3.OpenIndex( "MYINDEX3" ); - cout << "OpenIndex 3 rc = " << rc << "\n"; + std::cout << "OpenIndex 3 rc = " << rc << "\n"; rc = i4.OpenIndex( "MYINDEX4" ); - cout << "OpenIndex 4 rc = " << rc << "\n"; + std::cout << "OpenIndex 4 rc = " << rc << "\n"; rc = i1.FindKey( "Queue" ); /* alpha search */ - cout << "Find Key rc = " << rc << "\n"; + std::cout << "Find Key rc = " << rc << "\n"; rc = i4.FindKey( (xbDouble) 77.77 ); /* numeric search */ - cout << "Find Key rc = " << rc << "\n"; + std::cout << "Find Key rc = " << rc << "\n"; rc = i1.GetFirstKey(); - cout << "GetFirstKey rc = " << rc << "\n"; + std::cout << "GetFirstKey rc = " << rc << "\n"; rc = i1.GetNextKey(); - cout << "GetNextKey rc = " << rc << "\n"; + std::cout << "GetNextKey rc = " << rc << "\n"; rc = i1.GetLastKey(); - cout << "GetLastKey rc = " << rc << "\n"; + std::cout << "GetLastKey rc = " << rc << "\n"; rc = i1.GetPrevKey(); - cout << "GetPrevKey rc = " << rc << "\n"; + std::cout << "GetPrevKey rc = " << rc << "\n"; #endif // XB_INDEX_NDX d.CloseDatabase(); --- xdb-1.2.0.orig/examples/sample4.cpp +++ xdb-1.2.0/examples/sample4.cpp @@ -53,35 +53,35 @@ if(( rc = MyFile.OpenDatabase( "MYFILE.DBF" )) != XB_NO_ERROR ) { - cout << "\nError opening file rc = " << rc << "\n"; + std::cout << "\nError opening file rc = " << rc << "\n"; exit(1); } #ifdef XB_INDEX_NDX if(( rc = MyIndex1.OpenIndex( "MYINDEX1.NDX" )) != XB_NO_ERROR ) { - cout << "\nError opening index1 rc = " << rc << "\n"; + std::cout << "\nError opening index1 rc = " << rc << "\n"; exit(1); } if(( rc = MyIndex2.OpenIndex( "MYINDEX2.NDX" )) != XB_NO_ERROR ) { - cout << "\nError opening index2 rc = " << rc << "\n"; + std::cout << "\nError opening index2 rc = " << rc << "\n"; exit(1); } if(( rc = MyIndex3.OpenIndex( "MYINDEX3.NDX" )) != XB_NO_ERROR ) { - cout << "\nError opening index3 rc = " << rc << "\n"; + std::cout << "\nError opening index3 rc = " << rc << "\n"; exit(1); } if(( rc = MyIndex4.OpenIndex( "MYINDEX4.NDX" )) != XB_NO_ERROR ) { - cout << "\nError opening index4 rc = " << rc << "\n"; + std::cout << "\nError opening index4 rc = " << rc << "\n"; exit(1); } #endif // XB_INDEX_NDX - cout << "Sample GetRecord\n"; + std::cout << "Sample GetRecord\n"; MyFile.ExclusiveLock( F_SETLKW ); /* lock the files for our exclusive use */ @@ -90,26 +90,26 @@ MyFile.DeleteRecord(); if( MyFile.RecordDeleted() ) - cout << "Record is deleted...\n"; + std::cout << "Record is deleted...\n"; else - cout << "Record is not deleted...\n"; + std::cout << "Record is not deleted...\n"; /* to undelete a record the following commented code could be used MyFile.UndeleteRecord(); if( MyFile.RecordDeleted() ) - cout << "Record is deleted...\n"; + std::cout << "Record is deleted...\n"; else - cout << "Record is not deleted...\n"; + std::cout << "Record is not deleted...\n"; */ /* to permanently remove deleted records from the file, pack the database */ if(( rc = MyFile.PackDatabase( F_SETLKW )) != XB_NO_ERROR ) - cout << "\nError packing database rc = " << rc; + std::cout << "\nError packing database rc = " << rc; else - cout << "\nDatabase packed.\n"; + std::cout << "\nDatabase packed.\n"; MyFile.ExclusiveUnlock(); /* unlock the files */ MyFile.CloseDatabase(); /* close database */ --- xdb-1.2.0.orig/examples/sample1.cpp +++ xdb-1.2.0/examples/sample1.cpp @@ -71,29 +71,29 @@ if(( rc = MyFile.CreateDatabase( "MYFILE.DBF", MyRecord, XB_OVERLAY )) != XB_NO_ERROR ) - cout << "\nError creating database = " << rc << "\n"; + std::cout << "\nError creating database = " << rc << "\n"; else { /* define a simple index */ #ifdef XB_INDEX_NDX if(( rc = MyIndex1.CreateIndex( "MYINDEX1.NDX", "LASTNAME", XB_NOT_UNIQUE, XB_OVERLAY )) != XB_NO_ERROR ) - cout << "\nError creating index 1 = " << rc << "\n"; + std::cout << "\nError creating index 1 = " << rc << "\n"; /* define a multi-field index "LASTNAME FIRSTNAME" */ if(( rc = MyIndex2.CreateIndex( "MYINDEX2.NDX", "LASTNAME+FIRSTNAME", XB_NOT_UNIQUE, XB_OVERLAY )) != XB_NO_ERROR ) - cout << "\nError creating index 2 = " << rc << "\n"; + std::cout << "\nError creating index 2 = " << rc << "\n"; /* define a multi-field index "LASTNAMEFIRSTNAME" */ if(( rc = MyIndex3.CreateIndex( "MYINDEX3.NDX", "LASTNAME-FIRSTNAME", XB_NOT_UNIQUE, XB_OVERLAY )) != XB_NO_ERROR ) - cout << "\nError creating index 3 = " << rc << "\n"; + std::cout << "\nError creating index 3 = " << rc << "\n"; /* define a numeric index "ZIPCODE" */ if(( rc = MyIndex4.CreateIndex( "MYINDEX4.NDX", "ZIPCODE", XB_NOT_UNIQUE, XB_OVERLAY )) != XB_NO_ERROR ) - cout << "\nError creating index 4 = " << rc << "\n"; + std::cout << "\nError creating index 4 = " << rc << "\n"; #endif // XB_INDEX_NDX } --- xdb-1.2.0.orig/bin/copydbf.cpp +++ xdb-1.2.0/bin/copydbf.cpp @@ -30,7 +30,7 @@ int main(int ac,char** av) { if (3 != ac) { - cout << + std::cout << "\nUsage: copydbf filename1 filename2\n" "This program copies the structure of one dbf file to another\n"; return 1; @@ -44,7 +44,7 @@ xbShort rc = MyFile.OpenDatabase( sfilename ); if( rc != XB_NO_ERROR ) { - cout << "Could not open file " << sfilename << " Error = " << rc << "\n"; + std::cout << "Could not open file " << sfilename << " Error = " << rc << "\n"; return 2; } @@ -53,7 +53,7 @@ if(( rc = MyFile.CopyDbfStructure( tfilename, OverlaySwitch )) != XB_NO_ERROR ) { - cout << "Could not copy file " << tfilename << " Error = " << rc << "\n"; + std::cout << "Could not copy file " << tfilename << " Error = " << rc << "\n"; return 3; } --- xdb-1.2.0.orig/bin/dumpdbt.cpp +++ xdb-1.2.0/bin/dumpdbt.cpp @@ -37,7 +37,7 @@ xbDbf dbf( &x ); if( ac <= 1 ){ - cout << "\nUsage: dumpdbt filename...\n"; + std::cout << "\nUsage: dumpdbt filename...\n"; return 1; } @@ -47,16 +47,16 @@ if( dbf.OpenDatabase( filename )){ - cout << "\nCant open input file " << filename; + std::cout << "\nCant open input file " << filename; return 2; } - cout << "\n\nFree Block Chain...."; + std::cout << "\n\nFree Block Chain...."; #ifdef XBASE_DEBUG dbf.DumpMemoFreeChain(); - cout <<"\nEnd of free block chain\n***********************************"; + std::cout <<"\nEnd of free block chain\n***********************************"; #else - cout << "\nXBASE_DEBUG is not compiled in\n"; + std::cout << "\nXBASE_DEBUG is not compiled in\n"; #endif /* lock the memo file */ @@ -65,19 +65,19 @@ # endif /* XB_LOCKING_ON */ if( !dbf.MemoFieldsPresent() ) { - cout << "No memo fields exist in " << filename << endl; + std::cout << "No memo fields exist in " << filename << std::endl; } else { xbLong BufSize = 0L; char* Buf = NULL; for( xbLong l = 1; l <= dbf.NoOfRecords(); l++ ) { dbf.GetRecord( l ); - cout << "\nRecord # " << dbf.GetCurRecNo(); + std::cout << "\nRecord # " << dbf.GetCurRecNo(); for( int j = 0; j < dbf.FieldCount(); j++ ) { if( dbf.GetFieldType( j ) == 'M' ) { int len = dbf.GetMemoFieldLen( j ); - cout << "\nMemo field " << dbf.GetFieldName(j) << " length = " << len; - cout << " Head Block = " << dbf.GetLongField( j ) << "\n"; + std::cout << "\nMemo field " << dbf.GetFieldName(j) << " length = " << len; + std::cout << " Head Block = " << dbf.GetLongField( j ) << "\n"; if( len > BufSize ) { if( BufSize ) free( Buf ); @@ -87,7 +87,7 @@ } dbf.GetMemoField( j, len, Buf, F_SETLKW ); for( int i = 0; i < len; i++ ) - cout << Buf[i]; + std::cout << Buf[i]; } } } @@ -98,11 +98,11 @@ dbf.LockMemoFile( F_SETLK, F_UNLCK ); # endif /* XB_LOCKING_ON */ - cout << "\n"; + std::cout << "\n"; dbf.CloseDatabase(); } #else - cout << "\nXB_MEMO_FIELDS is not compiled in\n"; + std::cout << "\nXB_MEMO_FIELDS is not compiled in\n"; #endif } return 0; --- xdb-1.2.0.orig/bin/locktest.cpp +++ xdb-1.2.0/bin/locktest.cpp @@ -13,32 +13,32 @@ xbShort rc; if(2!=ac){ - cout << "\nUsage: locktest filename\n"; + std::cout << "\nUsage: locktest filename\n"; return 1; } if(( rc = d.OpenDatabase( av[1] )) != XB_NO_ERROR ) { - cout << "\nError " << rc << " opening file " << av[1] << endl; + std::cout << "\nError " << rc << " opening file " << av[1] << std::endl; exit(0); } xbXBase x; xbDbf d( &x ); - cout << "\nGoing to lock database..." << endl; + std::cout << "\nGoing to lock database..." << std::endl; rc = d.LockDatabase( F_SETLKW, F_WRLCK, 1L ); if ( rc == -1 ){ perror("Lock Error"); return 2; } - cout << "Database locked\n\nEnter a keystroke to release lock\n"; + std::cout << "Database locked\n\nEnter a keystroke to release lock\n"; char xx[4]; - cin >> xx; + std::cin >> xx; rc = d.LockDatabase( F_SETLK, F_UNLCK, 1L ); - cout << "Unlock database rc = " << rc << "\n"; + std::cout << "Unlock database rc = " << rc << "\n"; d.CloseDatabase(); #else - cout << "\nXBASE_LOCKING_ON is not compiled in\n"; + std::cout << "\nXBASE_LOCKING_ON is not compiled in\n"; #endif return 0; } --- xdb-1.2.0.orig/bin/zap.cpp +++ xdb-1.2.0/bin/zap.cpp @@ -31,7 +31,7 @@ int main(int ac,char** av) { if (ac <= 1) { - cout << + std::cout << "\nUsage: zap filename...\n" "\nThis program does not automatically reindex any indices." "\nUse the reindex program to reindex any indexes associated" @@ -49,18 +49,18 @@ xbDbf MyFile( &x ); if( MyFile.OpenDatabase( filename )) { - cout << "Could not open file " << filename << "\n"; + std::cout << "Could not open file " << filename << "\n"; return 0; } xbShort rc = MyFile.Zap( F_SETLKW ); if( rc != XB_NO_ERROR ) { - cout << "\nError zapping database ==> " << filename; - cout << " Return Code = " << rc; + std::cout << "\nError zapping database ==> " << filename; + std::cout << " Return Code = " << rc; } MyFile.CloseDatabase(); /* close database */ - cout << "\nZap Database complete...\n\n"; + std::cout << "\nZap Database complete...\n\n"; } return 0; --- xdb-1.2.0.orig/bin/deletall.cpp +++ xdb-1.2.0/bin/deletall.cpp @@ -31,7 +31,7 @@ int main(int ac,char** av) { if (ac <= 1) { - cout << + std::cout << "\nUsage: deletall filename...\n" ; return 1; @@ -44,18 +44,18 @@ xbDbf MyFile( &x ); if( MyFile.OpenDatabase( filename )) { - cout << "Could not open file " << filename << "\n"; + std::cout << "Could not open file " << filename << "\n"; return 2; } xbShort rc = MyFile.DeleteAllRecords(); if( rc != XB_NO_ERROR ) { - cout << "\nError Deleting all records - database ==> " << filename; - cout << " Return Code = " << rc; + std::cout << "\nError Deleting all records - database ==> " << filename; + std::cout << " Return Code = " << rc; } MyFile.CloseDatabase(); /* close database */ - cout << "\nDone...\n\n"; + std::cout << "\nDone...\n\n"; } return 0; --- xdb-1.2.0.orig/bin/undelall.cpp +++ xdb-1.2.0/bin/undelall.cpp @@ -31,7 +31,7 @@ int main(int ac,char** av) { if (ac <= 1) { - cout << + std::cout << "\nUsage: undelall filename...\n" "\nThis program does not automatically reindex any NDX indexes." "\nUse the reindex program to reindex any indexes associated" @@ -49,18 +49,18 @@ xbDbf MyFile( &x ); if( MyFile.OpenDatabase( filename )) { - cout << "Could not open file " << filename << "\n"; + std::cout << "Could not open file " << filename << "\n"; return 0; } xbShort rc = MyFile.UndeleteAllRecords(); if( rc != XB_NO_ERROR ) { - cout << "\nError undeleting records - database ==> " << filename; - cout << " Return Code = " << rc; + std::cout << "\nError undeleting records - database ==> " << filename; + std::cout << " Return Code = " << rc; } MyFile.CloseDatabase(); /* close database */ - cout << "\nUndelete all records complete...\n\n"; + std::cout << "\nUndelete all records complete...\n\n"; } return 0; } --- xdb-1.2.0.orig/bin/dbfutil1.cpp +++ xdb-1.2.0/bin/dbfutil1.cpp @@ -36,7 +36,7 @@ /* stats */ void MyClass::FileStats() { - cout << "Number of records = " << d.NoOfRecords() << endl; + std::cout << "Number of records = " << d.NoOfRecords() << std::endl; } /************************************************************************/ /* open database */ @@ -44,11 +44,11 @@ { int rc; char filename[50]; - cout << "Enter database file name: "; - cin >> filename; + std::cout << "Enter database file name: "; + std::cin >> filename; rc = d.OpenDatabase( filename ); - cout << "Return Code " << rc << endl; + std::cout << "Return Code " << rc << std::endl; return rc; } /************************************************************************/ @@ -57,7 +57,7 @@ { int rc; rc = d.CloseDatabase(); - cout << "Return Code " << rc << endl; + std::cout << "Return Code " << rc << std::endl; return rc; } /************************************************************************/ @@ -72,11 +72,11 @@ xbLong MemoFieldLen = 0L; char filename[50]; - cout << "Enter database file name to convert to: "; - cin >> filename; + std::cout << "Enter database file name to convert to: "; + std::cin >> filename; if(( rc = d2.OpenDatabase( filename )) != XB_NO_ERROR ){ - cout << "Error " << rc << " opening database" << endl; + std::cout << "Error " << rc << " opening database" << std::endl; return rc; } @@ -87,11 +87,11 @@ for( xbShort i = 0; i < FieldCnt++; i++ ) { if(( FieldNo = d2.GetFieldNo( d.GetFieldName( i ))) == -1 ) - cout << "Error converting field " << d.GetFieldName( i ) << endl; + std::cout << "Error converting field " << d.GetFieldName( i ) << std::endl; else { if( d.GetFieldType( i ) != d2.GetFieldType( FieldNo )) - cout << "Error - different field types " << d.GetFieldName(i); + std::cout << "Error - different field types " << d.GetFieldName(i); else { if( d.GetFieldType( i ) == 'M' ) @@ -126,16 +126,16 @@ xbNdx n(&d); int rc; char filename[50]; - cout << "Enter index file name: "; - cin >> filename; + std::cout << "Enter index file name: "; + std::cin >> filename; if(( rc = n.OpenIndex( filename )) != XB_NO_ERROR ){ - cout << "Error " << rc << " Opening index" << endl; + std::cout << "Error " << rc << " Opening index" << std::endl; return rc; } if(( rc = n.ReIndex()) != XB_NO_ERROR ) - cout << "Error " << rc << " Reindexing database" << endl; + std::cout << "Error " << rc << " Reindexing database" << std::endl; return rc; } @@ -144,11 +144,11 @@ { int rc; xbLong RecNo; - cout << "Enter record number: "; - cin >> RecNo; + std::cout << "Enter record number: "; + std::cin >> RecNo; rc = d.GetRecord( RecNo ); - cout << "Return Code = " << rc << endl; + std::cout << "Return Code = " << rc << std::endl; return rc; } /************************************************************************/ @@ -160,32 +160,32 @@ char bufchar[2]; char *buf; - cout << "Enter Field Number: " << endl; - cin >> fn; + std::cout << "Enter Field Number: " << std::endl; + std::cin >> fn; if( fn < 0 || fn > d.FieldCount()){ - cout << "Invalid Field Number" << endl; + std::cout << "Invalid Field Number" << std::endl; return 0; } if( d.GetFieldType( fn ) != 'M' ){ - cout << "Field " << fn << " is not a memo field" << endl; - cout << "Field Name = " << d.GetFieldName( fn ) << " type= "; - cout << d.GetFieldType( fn ) << endl; + std::cout << "Field " << fn << " is not a memo field" << std::endl; + std::cout << "Field Name = " << d.GetFieldName( fn ) << " type= "; + std::cout << d.GetFieldType( fn ) << std::endl; return 0; } - cout << "Enter length of memo data:" << endl; - cin >> len; + std::cout << "Enter length of memo data:" << std::endl; + std::cin >> len; - cout << "Enter character to populate memo data:" << endl; - cin >> bufchar; + std::cout << "Enter character to populate memo data:" << std::endl; + std::cin >> bufchar; buf = new char[len]; memset( buf, bufchar[0], len ); rc = d.UpdateMemoData( fn, len, buf, F_SETLKW ); - cout << "Return Code = " << rc << endl; + std::cout << "Return Code = " << rc << std::endl; return rc; #else - cout << "\nXB_MEMO_FIELDS is not compiled in\n"; + std::cout << "\nXB_MEMO_FIELDS is not compiled in\n"; return 0; #endif } @@ -194,23 +194,23 @@ { #ifdef XB_MEMO_FIELDS xbShort fn,rc; - cout << "Enter Field Number: " << endl; - cin >> fn; + std::cout << "Enter Field Number: " << std::endl; + std::cin >> fn; if( fn < 0 || fn > d.FieldCount()){ - cout << "Invalid Field Number" << endl; + std::cout << "Invalid Field Number" << std::endl; return 0; } if( d.GetFieldType( fn ) != 'M' ){ - cout << "Field " << fn << " is not a memo field" << endl; - cout << "Field Name = " << d.GetFieldName( fn ) << " type= "; - cout << d.GetFieldType( fn ) << endl; + std::cout << "Field " << fn << " is not a memo field" << std::endl; + std::cout << "Field Name = " << d.GetFieldName( fn ) << " type= "; + std::cout << d.GetFieldType( fn ) << std::endl; return 0; } rc = d.UpdateMemoData( fn, 0, 0, F_SETLKW ); - cout << "Return Code = " << rc << endl; + std::cout << "Return Code = " << rc << std::endl; return rc; #else - cout << "\nXB_MEMO_FIELDS is not compiled in\n"; + std::cout << "\nXB_MEMO_FIELDS is not compiled in\n"; return 0; #endif } @@ -223,12 +223,12 @@ #ifdef XBASE_DEBUG /* FIXME? Gary, do you mean header or free page list? */ rc = d.DumpMemoFreeChain(); - cout << "\nFuncion Return Code = " << rc << endl; + std::cout << "\nFuncion Return Code = " << rc << std::endl; #else - cout << "\nXBASE_DEBUG is not compiled in\n"; + std::cout << "\nXBASE_DEBUG is not compiled in\n"; #endif #else - cout << "\nXB_MEMO_FIELDS is not compiled in\n"; + std::cout << "\nXB_MEMO_FIELDS is not compiled in\n"; #endif return rc; } @@ -239,16 +239,16 @@ xbLong BlocksNeeded, Location, PrevNode; int rc; - cout << "Enter number of blocks: " << endl; - cin >> BlocksNeeded; - cout << "Enter starting location: " << endl; - cin >> Location; - cout << "Enter previous node: " << endl; - cin >> PrevNode; + std::cout << "Enter number of blocks: " << std::endl; + std::cin >> BlocksNeeded; + std::cout << "Enter starting location: " << std::endl; + std::cin >> Location; + std::cout << "Enter previous node: " << std::endl; + std::cin >> PrevNode; rc = d.GetBlockSetFromChain( BlocksNeeded, Location, PrevNode ); - cout << "Return code = " << rc << endl; + std::cout << "Return code = " << rc << std::endl; #else - cout << "\nXB_MEMO_FIELDS is not compiled in\n"; + std::cout << "\nXB_MEMO_FIELDS is not compiled in\n"; #endif } /************************************************************************/ @@ -258,20 +258,20 @@ xbLong BlocksNeeded, Location, PrevNode; int rc; - cout << "Enter number of blocks: " << endl; - cin >> BlocksNeeded; + std::cout << "Enter number of blocks: " << std::endl; + std::cin >> BlocksNeeded; rc = d.FindBlockSetInChain( BlocksNeeded, 0, Location, PrevNode ); - cout << "Return code = " << rc << endl; - cout << "Location = " << Location << endl; - cout << "Previous Node = " << PrevNode << endl; + std::cout << "Return code = " << rc << std::endl; + std::cout << "Location = " << Location << std::endl; + std::cout << "Previous Node = " << PrevNode << std::endl; #else - cout << "\nXB_MEMO_FIELDS is not compiled in\n"; + std::cout << "\nXB_MEMO_FIELDS is not compiled in\n"; #endif } /************************************************************************/ void MyClass::IndexMenu() { - cout << "not available" << endl; + std::cout << "not available" << std::endl; return; } /************************************************************************/ @@ -280,18 +280,18 @@ int option = 0; while( option != 99 ) { - cout << endl << endl << "Debug Menu" << endl; - cout << "1 - Dislay DBT Header" << endl; - cout << "2 - Find Memo Blocks" << endl; - cout << "3 - Get Memo Blocks" << endl; - cout << "99 - Exit Menu" << endl; - cin >> option; + std::cout << std::endl << std::endl << "Debug Menu" << std::endl; + std::cout << "1 - Dislay DBT Header" << std::endl; + std::cout << "2 - Find Memo Blocks" << std::endl; + std::cout << "3 - Get Memo Blocks" << std::endl; + std::cout << "99 - Exit Menu" << std::endl; + std::cin >> option; switch( option ){ case 1: DumpDbtHeader(); break; case 2: FindMemoBlocks(); break; case 3: GetMemoBlocks(); break; case 99: break; - default: cout << "Invalid option" << endl; break; + default: std::cout << "Invalid option" << std::endl; break; } } } @@ -301,16 +301,16 @@ int option = 0; while( option != 99 ) { - cout << endl << endl << "Field Menu" << endl; - cout << "1 - Delete Memo Field" << endl; - cout << "2 - Update Memo Field" << endl; - cout << "99 - Exit Menu" << endl; - cin >> option; + std::cout << std::endl << std::endl << "Field Menu" << std::endl; + std::cout << "1 - Delete Memo Field" << std::endl; + std::cout << "2 - Update Memo Field" << std::endl; + std::cout << "99 - Exit Menu" << std::endl; + std::cin >> option; switch( option ){ case 1: DeleteMemoField(); break; case 2: UpdateMemoField(); break; case 99: break; - default: cout << "Function not available" << endl; break; + default: std::cout << "Function not available" << std::endl; break; } } } @@ -318,19 +318,19 @@ void MyClass::RecordMenu() { int option = 0; - cout << "File Menu" << endl; + std::cout << "File Menu" << std::endl; while( option != 99 ) { - cout << endl << endl << "Record Menu" << endl; - cout << "1 - Get Record" << endl; - cout << "2 - Blank Record" << endl; - cout << "3 - Append Record" << endl; - cout << "4 - Put Record" << endl; - cout << "99 - Exit Menu" << endl; - cin >> option; + std::cout << std::endl << std::endl << "Record Menu" << std::endl; + std::cout << "1 - Get Record" << std::endl; + std::cout << "2 - Blank Record" << std::endl; + std::cout << "3 - Append Record" << std::endl; + std::cout << "4 - Put Record" << std::endl; + std::cout << "99 - Exit Menu" << std::endl; + std::cin >> option; switch( option ){ case 1: GetRecord(); break; case 99: break; - default: cout << "Invalid option" << endl; break; + default: std::cout << "Invalid option" << std::endl; break; } } } @@ -340,19 +340,19 @@ int option = 0; while( option != 99 ) { - cout << endl << endl << "File Menu" << endl; - cout << "1 - Open File" << endl; - cout << "2 - Close File" << endl; - cout << "3 - File Stats" << endl; - cout << "99 - Exit Menu" << endl; - cin >> option; + std::cout << std::endl << std::endl << "File Menu" << std::endl; + std::cout << "1 - Open File" << std::endl; + std::cout << "2 - Close File" << std::endl; + std::cout << "3 - File Stats" << std::endl; + std::cout << "99 - Exit Menu" << std::endl; + std::cin >> option; switch( option ){ case 1: OpenFile(); break; case 2: CloseFile(); break; case 3: FileStats(); break; case 99: break; - default: cout << "Invalid Option" << endl; + default: std::cout << "Invalid Option" << std::endl; } } } @@ -360,24 +360,24 @@ void MyClass::MainMenu() { int option = 0; - cout << endl<< endl << "XBase Utility Program"; + std::cout << std::endl<< std::endl << "XBase Utility Program"; while( option != 99 ) { - cout << endl << endl << "Main Menu" << endl; - cout << "1 - File Menu" << endl; - cout << "2 - Record Menu" << endl; - cout << "3 - Field Menu" << endl; - cout << "4 - Index Menu" << endl; - cout << "5 - Debug Menu" << endl; - cout << "99 - Exit" << endl; - cin >> option; + std::cout << std::endl << std::endl << "Main Menu" << std::endl; + std::cout << "1 - File Menu" << std::endl; + std::cout << "2 - Record Menu" << std::endl; + std::cout << "3 - Field Menu" << std::endl; + std::cout << "4 - Index Menu" << std::endl; + std::cout << "5 - Debug Menu" << std::endl; + std::cout << "99 - Exit" << std::endl; + std::cin >> option; switch( option ){ case 1: FileMenu(); break; case 2: RecordMenu(); break; case 3: FieldMenu(); break; case 4: IndexMenu(); break; case 5: DebugMenu(); break; - case 99: cout << "Bye!! - Thanks for using XBase" << endl; break; - default: cout << "Invalid function" << endl; break; + case 99: std::cout << "Bye!! - Thanks for using XBase" << std::endl; break; + default: std::cout << "Invalid function" << std::endl; break; } } } --- xdb-1.2.0.orig/bin/dumphdr.cpp +++ xdb-1.2.0/bin/dumphdr.cpp @@ -37,7 +37,7 @@ xbXBase x; if( ac <= 1 ) { - cout << "\nUsage: dumphdr filename...\n"; + std::cout << "\nUsage: dumphdr filename...\n"; return 1; } for( int i = 1; i < ac; ++i ){ @@ -46,14 +46,14 @@ if(( rc = MyFile.OpenDatabase( filename )) != 0 ) { - cout << "Could not open file rc = " << rc << " file = " << filename << "\n"; + std::cout << "Could not open file rc = " << rc << " file = " << filename << "\n"; return 0; } MyFile.DumpHeader( 3 ); MyFile.CloseDatabase(); } #else - cout << "\nXBASE_DEBUG is not compiled in\n"; + std::cout << "\nXBASE_DEBUG is not compiled in\n"; #endif return 0; } --- xdb-1.2.0.orig/bin/packdbf.cpp +++ xdb-1.2.0/bin/packdbf.cpp @@ -32,7 +32,7 @@ int main(int ac,char** av) { if (ac <= 1) { - cout << + std::cout << "\nUsage: packdbf filename...\n" "\nThis program does not automatically reindex any NDX indexes." "\nUse the reindex program to reindex any indexes associated" @@ -50,18 +50,18 @@ xbDbf MyFile( &x ); if( MyFile.OpenDatabase( filename )) { - cout << "Could not open file " << filename << "\n"; + std::cout << "Could not open file " << filename << "\n"; return 1; } xbShort rc = MyFile.PackDatabase( F_SETLKW ); if( rc != XB_NO_ERROR ) { - cout << "\nError packing database ==> " << filename; - cout << " Return Code = " << rc; + std::cout << "\nError packing database ==> " << filename; + std::cout << " Return Code = " << rc; } MyFile.CloseDatabase(); /* close database */ - cout << "\nPack Database complete...\n\n"; + std::cout << "\nPack Database complete...\n\n"; } return 0; --- xdb-1.2.0.orig/bin/dumprecs.cpp +++ xdb-1.2.0/bin/dumprecs.cpp @@ -38,7 +38,7 @@ int main(int ac,char** av) { if (ac <= 1) { - cout << + std::cout << "\nUsage: dumprecs filename...\n" ; return 1; @@ -55,11 +55,11 @@ #endif xbShort rc = MyFile.OpenDatabase(filename); if ( rc != XB_NO_ERROR) { - cout << "Could not open file " << filename << " Error = " << rc << "\n"; + std::cout << "Could not open file " << filename << " Error = " << rc << "\n"; return 0; } - cout << "\nLoop through forwards...\n"; + std::cout << "\nLoop through forwards...\n"; rc = MyFile.GetFirstRecord(); while(rc == XB_NO_ERROR) { MyFile.DumpRecord( MyFile.GetCurRecNo() ); --- xdb-1.2.0.orig/bin/reindex.cpp +++ xdb-1.2.0/bin/reindex.cpp @@ -33,7 +33,7 @@ int main(int ac,char** av) { if (3 != ac) { - cout << + std::cout << "\nUsage: reindex dbf_file ndx_file\n" ; return 1; @@ -47,25 +47,25 @@ xbNdx MyIndex( &MyFile ); if( MyFile.OpenDatabase( filename )) { - cout << "Could not open file " << filename << "\n"; + std::cout << "Could not open file " << filename << "\n"; return 0; } if( MyIndex.OpenIndex( filename2 )) { - cout << "Could not open index file " << filename2 << "\n"; + std::cout << "Could not open index file " << filename2 << "\n"; return 0; } xbShort rc = MyIndex.ReIndex(); if( rc != XB_NO_ERROR ) { - cout << "\nError reindexing index ==> " << filename2; - cout << " Return Code = " << rc; + std::cout << "\nError reindexing index ==> " << filename2; + std::cout << " Return Code = " << rc; } /* or if(( rc = MyFile.RebuildAllIndicis()) != XB_NO_ERROR ) { - cout << "\nError reindexing..."; - cout << "\nReturn Code = " << rc; + std::cout << "\nError reindexing..."; + std::cout << "\nReturn Code = " << rc; } */ MyFile.CloseDatabase(); /* close database */ --- xdb-1.2.0.orig/bin/checkndx.cpp +++ xdb-1.2.0/bin/checkndx.cpp @@ -37,32 +37,32 @@ xbShort rc; if( 3 != ac ){ - cout << + std::cout << "\nUsage: checkndx dbf_file index_file\n"; return 1; } if(( rc = d.OpenDatabase( av[1] )) != XB_NO_ERROR ) { - cout << "\nCould not open file " << av[1] << " rc = " << rc << "\n"; + std::cout << "\nCould not open file " << av[1] << " rc = " << rc << "\n"; return 2; } if(( rc = i.OpenIndex( av[2] )) != XB_NO_ERROR ) { - cout << "\nCould not open file " << av[2] << " rc = " << rc << "\n"; + std::cout << "\nCould not open file " << av[2] << " rc = " << rc << "\n"; return 3; } - cout << "\nRunning...\n"; + std::cout << "\nRunning...\n"; rc = i.CheckIndexIntegrity( 1 ); - cout << "\nNdx integrity check = " << rc << "\n"; + std::cout << "\nNdx integrity check = " << rc << "\n"; i.DumpHdrNode(); d.CloseDatabase(); #else - cout << "\nXBASE_DEBUG is not compiled in\n"; + std::cout << "\nXBASE_DEBUG is not compiled in\n"; #endif return 0; }