From f7aabfbd54bdcb775c6a96d9ca20548c7dc8f360 Mon Sep 17 00:00:00 2001 From: sebres Date: Fri, 22 Jul 2022 18:49:27 +0000 Subject: restore FF-char (fossil seems to loss form feed if commits with convertion from CRLF to LF) --- generic/tclIO.c | 387 +++++++++++++++++++------------------------------------- 1 file changed, 129 insertions(+), 258 deletions(-) diff --git a/generic/tclIO.c b/generic/tclIO.c index e03b9c5..376ab36 100644 --- a/generic/tclIO.c +++ b/generic/tclIO.c @@ -340,8 +340,7 @@ static const Tcl_ObjType chanObjType = { (((st)->csPtrW) && ((fl) & TCL_WRITABLE))) #define MAX_CHANNEL_BUFFER_SIZE (1024*1024) - - + /* *--------------------------------------------------------------------------- * @@ -511,8 +510,7 @@ ChanWrite( return chanPtr->typePtr->outputProc(chanPtr->instanceData, src, srcLen, errnoPtr); } - - + /* *--------------------------------------------------------------------------- * @@ -540,8 +538,7 @@ TclInitIOSubsystem(void) (void) TCL_TSD_INIT(&dataKey); } - - + /* *------------------------------------------------------------------------- * @@ -687,8 +684,7 @@ TclFinalizeIOSubsystem(void) TclpFinalizeSockets(); TclpFinalizePipes(); } - - + /* *---------------------------------------------------------------------- * @@ -729,8 +725,7 @@ Tcl_SetStdChannel( break; } } - - + /* *---------------------------------------------------------------------- * @@ -806,8 +801,7 @@ Tcl_GetStdChannel( } return channel; } - - + /* *---------------------------------------------------------------------- * @@ -845,8 +839,7 @@ Tcl_CreateCloseHandler( cbPtr->nextPtr = statePtr->closeCbPtr; statePtr->closeCbPtr = cbPtr; } - - + /* *---------------------------------------------------------------------- * @@ -891,8 +884,7 @@ Tcl_DeleteCloseHandler( cbPrevPtr = cbPtr; } } - - + /* *---------------------------------------------------------------------- * @@ -948,8 +940,7 @@ GetChannelTable( } return hTblPtr; } - - + /* *---------------------------------------------------------------------- * @@ -1039,8 +1030,7 @@ DeleteChannelTable( Tcl_DeleteHashTable(hTblPtr); ckfree(hTblPtr); } - - + /* *---------------------------------------------------------------------- * @@ -1096,8 +1086,7 @@ CheckForStdChannelsBeingClosed( } } } - - + /* *---------------------------------------------------------------------- * @@ -1130,8 +1119,7 @@ Tcl_IsStandardChannel( return 0; } } - - + /* *---------------------------------------------------------------------- * @@ -1188,8 +1176,7 @@ Tcl_RegisterChannel( } statePtr->refCount++; } - - + /* *---------------------------------------------------------------------- * @@ -1274,8 +1261,7 @@ Tcl_UnregisterChannel( } return TCL_OK; } - - + /* *---------------------------------------------------------------------- * @@ -1321,8 +1307,7 @@ Tcl_DetachChannel( return DetachChannel(interp, chan); } - - + /* *---------------------------------------------------------------------- * @@ -1395,8 +1380,7 @@ DetachChannel( return TCL_OK; } - - + /* *--------------------------------------------------------------------------- * @@ -1478,8 +1462,7 @@ Tcl_GetChannel( return (Tcl_Channel) chanPtr; } - - + /* *--------------------------------------------------------------------------- * @@ -1575,8 +1558,7 @@ TclGetChannelFromObj( return TCL_OK; } - - + /* *---------------------------------------------------------------------- * @@ -1784,8 +1766,7 @@ Tcl_CreateChannel( } return (Tcl_Channel) chanPtr; } - - + /* *---------------------------------------------------------------------- * @@ -2014,8 +1995,7 @@ ChannelFree( } chanPtr->typePtr = NULL; } - - + /* *---------------------------------------------------------------------- * @@ -2203,8 +2183,7 @@ Tcl_UnstackChannel( return TCL_OK; } - - + /* *---------------------------------------------------------------------- * @@ -2232,8 +2211,7 @@ Tcl_GetStackedChannel( return (Tcl_Channel) chanPtr->downChanPtr; } - - + /* *---------------------------------------------------------------------- * @@ -2261,8 +2239,7 @@ Tcl_GetTopChannel( return (Tcl_Channel) chanPtr->state->topChanPtr; } - - + /* *---------------------------------------------------------------------- * @@ -2288,8 +2265,7 @@ Tcl_GetChannelInstanceData( return chanPtr->instanceData; } - - + /* *---------------------------------------------------------------------- * @@ -2316,8 +2292,7 @@ Tcl_GetChannelThread( return chanPtr->state->managingThread; } - - + /* *---------------------------------------------------------------------- * @@ -2343,8 +2318,7 @@ Tcl_GetChannelType( return chanPtr->typePtr; } - - + /* *---------------------------------------------------------------------- * @@ -2372,8 +2346,7 @@ Tcl_GetChannelMode( return (statePtr->flags & (TCL_READABLE | TCL_WRITABLE)); } - - + /* *---------------------------------------------------------------------- * @@ -2400,8 +2373,7 @@ Tcl_GetChannelName( return statePtr->channelName; } - - + /* *---------------------------------------------------------------------- * @@ -2443,8 +2415,7 @@ Tcl_GetChannelHandle( } return result; } - - + /* *--------------------------------------------------------------------------- * @@ -2512,8 +2483,7 @@ IsShared( { return bufPtr->refCount > 1; } - - + /* *---------------------------------------------------------------------- * @@ -2602,8 +2572,7 @@ RecycleBuffer( bufPtr->nextAdded = BUFFER_PADDING; bufPtr->nextPtr = NULL; } - - + /* *---------------------------------------------------------------------- * @@ -2639,8 +2608,7 @@ DiscardOutputQueued( RecycleBuffer(statePtr, bufPtr, 0); } } - - + /* *---------------------------------------------------------------------- * @@ -2674,8 +2642,7 @@ CheckForDeadChannel( } return 1; } - - + /* *---------------------------------------------------------------------- * @@ -2977,8 +2944,7 @@ FlushChannel( TclChannelRelease((Tcl_Channel)chanPtr); return errorCode; } - - + /* *---------------------------------------------------------------------- * @@ -3159,8 +3125,7 @@ CloseChannel( return errorCode; } - - + /* *---------------------------------------------------------------------- * @@ -3275,8 +3240,7 @@ Tcl_CutChannel( /* Channel is not managed by any thread */ statePtr->managingThread = NULL; } - - + /* *---------------------------------------------------------------------- * @@ -3366,8 +3330,7 @@ Tcl_SpliceChannel( ChanThreadAction(chanPtr, TCL_CHANNEL_THREAD_INSERT); } } - - + /* *---------------------------------------------------------------------- * @@ -3561,8 +3524,7 @@ Tcl_Close( } return TCL_OK; } - - + /* *---------------------------------------------------------------------- * @@ -3696,8 +3658,7 @@ Tcl_CloseEx( return TCL_OK; } - - + /* *---------------------------------------------------------------------- * @@ -3773,8 +3734,7 @@ CloseWrite( return TCL_OK; } - - + /* *---------------------------------------------------------------------- * @@ -3910,8 +3870,7 @@ CloseChannelPart( ResetFlag(statePtr, flags & (TCL_READABLE | TCL_WRITABLE)); return TCL_OK; } - - + /* *---------------------------------------------------------------------- * @@ -4005,8 +3964,7 @@ Tcl_ClearChannelHandlers( } statePtr->scriptRecordPtr = NULL; } - - + /* *---------------------------------------------------------------------- * @@ -4060,8 +4018,7 @@ Tcl_Write( } return srcLen; } - - + /* *---------------------------------------------------------------------- * @@ -4118,8 +4075,7 @@ Tcl_WriteRaw( return written; } - - + /* *--------------------------------------------------------------------------- * @@ -4186,8 +4142,7 @@ Tcl_WriteChars( TclDecrRefCount(objPtr); return result; } - - + /* *--------------------------------------------------------------------------- * @@ -4241,8 +4196,7 @@ Tcl_WriteObj( return WriteChars(chanPtr, src, srcLen); } } - - + static void WillWrite( Channel *chanPtr) @@ -4257,8 +4211,7 @@ WillWrite( ChanSeek(chanPtr, -inputBuffered, SEEK_CUR, &ignore); } } - - + static int WillRead( Channel *chanPtr) @@ -4291,8 +4244,7 @@ WillRead( } return 0; } - - + /* *---------------------------------------------------------------------- * @@ -4492,8 +4444,7 @@ Write( return total; } - - + /* *--------------------------------------------------------------------------- * @@ -4532,8 +4483,7 @@ Tcl_Gets( TclDecrRefCount(objPtr); return charsStored; } - - + /* *--------------------------------------------------------------------------- * @@ -4946,8 +4896,7 @@ Tcl_GetsObj( TclChannelRelease((Tcl_Channel)chanPtr); return copiedTotal; } - - + /* *--------------------------------------------------------------------------- * @@ -5221,8 +5170,7 @@ TclGetsObjBinary( TclChannelRelease((Tcl_Channel)chanPtr); return copiedTotal; } - - + /* *--------------------------------------------------------------------------- * @@ -5264,8 +5212,7 @@ GetBinaryEncoding() } return tsdPtr->binaryEncoding; } - - + /* *--------------------------------------------------------------------------- * @@ -5458,8 +5405,7 @@ FilterInputBytes( gsPtr->bufPtr = bufPtr; return 0; } - - + /* *--------------------------------------------------------------------------- * @@ -5544,8 +5490,7 @@ PeekAhead( gsPtr->bytesWrote = 0; gsPtr->charsWrote = 0; } - - + /* *--------------------------------------------------------------------------- * @@ -5608,8 +5553,7 @@ CommonGetsCleanup( } } } - - + /* *---------------------------------------------------------------------- * @@ -5654,8 +5598,7 @@ Tcl_Read( return DoRead(chanPtr, dst, bytesToRead, 0); } - - + /* *---------------------------------------------------------------------- * @@ -5773,8 +5716,7 @@ Tcl_ReadRaw( } return copied; } - - + /* *--------------------------------------------------------------------------- * @@ -6029,8 +5971,7 @@ DoReadChars( TclChannelRelease((Tcl_Channel)chanPtr); return copied; } - - + /* *--------------------------------------------------------------------------- * @@ -6079,8 +6020,7 @@ ReadBytes( bufPtr->nextRemoved += toRead; return toRead; } - - + /* *--------------------------------------------------------------------------- * @@ -6483,8 +6423,7 @@ ReadChars( return numChars; } } - - + /* *--------------------------------------------------------------------------- * @@ -6660,8 +6599,7 @@ TranslateInputEOL( ResetFlag(statePtr, CHANNEL_BLOCKED|INPUT_SAW_CR); } } - - + /* *---------------------------------------------------------------------- * @@ -6749,8 +6687,7 @@ Tcl_Ungets( UpdateInterest(chanPtr); return len; } - - + /* *---------------------------------------------------------------------- * @@ -6794,8 +6731,7 @@ Tcl_Flush( return TCL_OK; } - - + /* *---------------------------------------------------------------------- * @@ -6842,8 +6778,7 @@ DiscardInputQueued( statePtr->saveInBufPtr = NULL; } } - - + /* *--------------------------------------------------------------------------- * @@ -6992,8 +6927,7 @@ GetInput( ReleaseChannelBuffer(bufPtr); return result; } - - + /* *---------------------------------------------------------------------- * @@ -7161,8 +7095,7 @@ Tcl_Seek( return curPos; } - - + /* *---------------------------------------------------------------------- * @@ -7251,8 +7184,7 @@ Tcl_Tell( } return curPos + outputBuffered; } - - + /* *--------------------------------------------------------------------------- * @@ -7293,8 +7225,7 @@ Tcl_TellOld( return (int) Tcl_WideAsLong(wResult); } - - + /* *--------------------------------------------------------------------------- * @@ -7366,8 +7297,7 @@ Tcl_TruncateChannel( } return TCL_OK; } - - + /* *--------------------------------------------------------------------------- * @@ -7455,8 +7385,7 @@ CheckChannelErrors( return 0; } - - + /* *---------------------------------------------------------------------- * @@ -7482,8 +7411,7 @@ Tcl_Eof( return GotFlag(statePtr, CHANNEL_EOF) ? 1 : 0; } - - + /* *---------------------------------------------------------------------- * @@ -7509,8 +7437,7 @@ Tcl_InputBlocked( return GotFlag(statePtr, CHANNEL_BLOCKED) ? 1 : 0; } - - + /* *---------------------------------------------------------------------- * @@ -7554,8 +7481,7 @@ Tcl_InputBuffered( return bytesBuffered; } - - + /* *---------------------------------------------------------------------- * @@ -7597,8 +7523,7 @@ Tcl_OutputBuffered( return bytesBuffered; } - - + /* *---------------------------------------------------------------------- * @@ -7633,8 +7558,7 @@ Tcl_ChannelBuffered( return bytesBuffered; } - - + /* *---------------------------------------------------------------------- * @@ -7692,8 +7616,7 @@ Tcl_SetChannelBufferSize( statePtr->inQueueTail = NULL; } } - - + /* *---------------------------------------------------------------------- * @@ -7720,8 +7643,7 @@ Tcl_GetChannelBufferSize( return statePtr->bufSize; } - - + /* *---------------------------------------------------------------------- * @@ -7792,8 +7714,7 @@ Tcl_BadChannelOption( Tcl_SetErrno(EINVAL); return TCL_ERROR; } - - + /* *---------------------------------------------------------------------- * @@ -8025,8 +7946,7 @@ Tcl_GetChannelOption( return Tcl_BadChannelOption(interp, optionName, NULL); } } - - + /* *--------------------------------------------------------------------------- * @@ -8328,8 +8248,7 @@ Tcl_SetChannelOption( return TCL_OK; } - - + /* *---------------------------------------------------------------------- * @@ -8383,8 +8302,7 @@ CleanupChannelHandlers( } } } - - + /* *---------------------------------------------------------------------- * @@ -8542,8 +8460,7 @@ done: tsdPtr->nestedHandlerPtr = nh.nestedHandlerPtr; } - - + /* *---------------------------------------------------------------------- * @@ -8644,8 +8561,7 @@ UpdateInterest( } ChanWatch(chanPtr, mask); } - - + /* *---------------------------------------------------------------------- * @@ -8690,8 +8606,7 @@ ChannelTimerProc( UpdateInterest(chanPtr); } } - - + /* *---------------------------------------------------------------------- * @@ -8771,8 +8686,7 @@ Tcl_CreateChannelHandler( UpdateInterest(statePtr->topChanPtr); } - - + /* *---------------------------------------------------------------------- * @@ -8862,8 +8776,7 @@ Tcl_DeleteChannelHandler( UpdateInterest(statePtr->topChanPtr); } - - + /* *---------------------------------------------------------------------- * @@ -8914,8 +8827,7 @@ DeleteScriptRecord( } } } - - + /* *---------------------------------------------------------------------- * @@ -8983,8 +8895,7 @@ CreateScriptRecord( TclChannelEventScriptInvoker, esPtr); } } - - + /* *---------------------------------------------------------------------- * @@ -9052,8 +8963,7 @@ TclChannelEventScriptInvoker( TclChannelRelease((Tcl_Channel)chanPtr); Tcl_Release(interp); } - - + /* *---------------------------------------------------------------------- * @@ -9151,8 +9061,7 @@ Tcl_FileEventObjCmd( return TCL_OK; } - - + /* *---------------------------------------------------------------------- * @@ -9179,8 +9088,7 @@ ZeroTransferTimerProc( */ CopyData((CopyState *)clientData, 0); } - - + /* *---------------------------------------------------------------------- * @@ -9333,8 +9241,7 @@ TclCopyChannel( return CopyData(csPtr, 0); } - - + /* *---------------------------------------------------------------------- * @@ -9885,8 +9792,7 @@ CopyData( } return result; } - - + /* *---------------------------------------------------------------------- * @@ -10132,8 +10038,7 @@ DoRead( TclChannelRelease((Tcl_Channel)chanPtr); return (int)(p - dst); } - - + /* *---------------------------------------------------------------------- * @@ -10159,8 +10064,7 @@ CopyEventProc( { (void) CopyData((CopyState *)clientData, mask); } - - + /* *---------------------------------------------------------------------- * @@ -10229,8 +10133,7 @@ StopCopy( outStatePtr->csPtrW = NULL; ckfree(csPtr); } - - + /* *---------------------------------------------------------------------- * @@ -10279,8 +10182,7 @@ StackSetBlockMode( } return 0; } - - + /* *---------------------------------------------------------------------- * @@ -10348,8 +10250,7 @@ SetBlockMode( } return TCL_OK; } - - + /* *---------------------------------------------------------------------- * @@ -10372,8 +10273,7 @@ Tcl_GetChannelNames( { return Tcl_GetChannelNamesEx(interp, NULL); } - - + /* *---------------------------------------------------------------------- * @@ -10459,8 +10359,7 @@ Tcl_GetChannelNamesEx( Tcl_SetObjResult(interp, resultPtr); return TCL_OK; } - - + /* *---------------------------------------------------------------------- * @@ -10510,8 +10409,7 @@ Tcl_IsChannelRegistered( return 1; } - - + /* *---------------------------------------------------------------------- * @@ -10537,8 +10435,7 @@ Tcl_IsChannelShared( return ((statePtr->refCount > 1) ? 1 : 0); } - - + /* *---------------------------------------------------------------------- * @@ -10587,8 +10484,7 @@ Tcl_IsChannelExisting( return 0; } - - + /* *---------------------------------------------------------------------- * @@ -10611,8 +10507,7 @@ Tcl_ChannelName( { return chanTypePtr->typeName; } - - + /* *---------------------------------------------------------------------- * @@ -10644,8 +10539,7 @@ Tcl_ChannelVersion( } return chanTypePtr->version; } - - + /* *---------------------------------------------------------------------- * @@ -10675,8 +10569,7 @@ Tcl_ChannelBlockModeProc( return chanTypePtr->blockModeProc; } - - + /* *---------------------------------------------------------------------- * @@ -10700,8 +10593,7 @@ Tcl_ChannelCloseProc( { return chanTypePtr->closeProc; } - - + /* *---------------------------------------------------------------------- * @@ -10725,8 +10617,7 @@ Tcl_ChannelClose2Proc( { return chanTypePtr->close2Proc; } - - + /* *---------------------------------------------------------------------- * @@ -10750,8 +10641,7 @@ Tcl_ChannelInputProc( { return chanTypePtr->inputProc; } - - + /* *---------------------------------------------------------------------- * @@ -10775,8 +10665,7 @@ Tcl_ChannelOutputProc( { return chanTypePtr->outputProc; } - - + /* *---------------------------------------------------------------------- * @@ -10800,8 +10689,7 @@ Tcl_ChannelSeekProc( { return chanTypePtr->seekProc; } - - + /* *---------------------------------------------------------------------- * @@ -10825,8 +10713,7 @@ Tcl_ChannelSetOptionProc( { return chanTypePtr->setOptionProc; } - - + /* *---------------------------------------------------------------------- * @@ -10850,8 +10737,7 @@ Tcl_ChannelGetOptionProc( { return chanTypePtr->getOptionProc; } - - + /* *---------------------------------------------------------------------- * @@ -10875,8 +10761,7 @@ Tcl_ChannelWatchProc( { return chanTypePtr->watchProc; } - - + /* *---------------------------------------------------------------------- * @@ -10900,8 +10785,7 @@ Tcl_ChannelGetHandleProc( { return chanTypePtr->getHandleProc; } - - + /* *---------------------------------------------------------------------- * @@ -10928,8 +10812,7 @@ Tcl_ChannelFlushProc( } return chanTypePtr->flushProc; } - - + /* *---------------------------------------------------------------------- * @@ -10956,8 +10839,7 @@ Tcl_ChannelHandlerProc( } return chanTypePtr->handlerProc; } - - + /* *---------------------------------------------------------------------- * @@ -10984,8 +10866,7 @@ Tcl_ChannelWideSeekProc( } return chanTypePtr->wideSeekProc; } - - + /* *---------------------------------------------------------------------- * @@ -11013,8 +10894,7 @@ Tcl_ChannelThreadActionProc( } return chanTypePtr->threadActionProc; } - - + /* *---------------------------------------------------------------------- * @@ -11050,8 +10930,7 @@ Tcl_SetChannelErrorInterp( } return; } - - + /* *---------------------------------------------------------------------- * @@ -11087,8 +10966,7 @@ Tcl_SetChannelError( } return; } - - + /* *---------------------------------------------------------------------- * @@ -11247,8 +11125,7 @@ FixLevelCode( ckfree(lvn); return msg; } - - + /* *---------------------------------------------------------------------- * @@ -11276,8 +11153,7 @@ Tcl_GetChannelErrorInterp( *msg = iPtr->chanMsg; iPtr->chanMsg = NULL; } - - + /* *---------------------------------------------------------------------- * @@ -11305,8 +11181,7 @@ Tcl_GetChannelError( *msg = statePtr->chanMsg; statePtr->chanMsg = NULL; } - - + /* *---------------------------------------------------------------------- * @@ -11334,8 +11209,7 @@ Tcl_ChannelTruncateProc( } return chanTypePtr->truncateProc; } - - + /* *---------------------------------------------------------------------- * @@ -11367,8 +11241,7 @@ DupChannelInternalRep( copyPtr->internalRep.twoPtrValue.ptr1 = resPtr; copyPtr->typePtr = srcPtr->typePtr; } - - + /* *---------------------------------------------------------------------- * @@ -11398,8 +11271,7 @@ FreeChannelInternalRep( Tcl_Release(resPtr->statePtr); ckfree(resPtr); } - - + #if 0 /* * For future debugging work, a simple function to print the flags of a @@ -11437,8 +11309,7 @@ DumpFlags( return 0; } #endif - - + /* * Local Variables: * mode: c -- cgit v0.12