From 499d0b02ca8ebbcfc2b832ffe8b51eafd0747edd Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Sat, 3 Feb 2007 17:49:33 +0000 Subject: [PATCH] DEVEL15-windows-log-eol-20070203 ensure that log files use CR-LF for end of line. the "fs memdump" output and the afsd_init.log initialization output were still using LF. (cherry picked from commit 1e44ef074aae0fd718f15ba8ff8b66bca1586c2f) --- src/WINNT/afsd/afsd_init.c | 6 +++--- src/WINNT/afsd/cm_buf.c | 6 +++--- src/WINNT/afsd/cm_scache.c | 10 +++++----- src/WINNT/afsd/cm_volume.c | 6 +++--- src/WINNT/afsd/smb.c | 36 ++++++++++++++++++------------------ 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/WINNT/afsd/afsd_init.c b/src/WINNT/afsd/afsd_init.c index f490af4a2..8a4e0b2a1 100644 --- a/src/WINNT/afsd/afsd_init.c +++ b/src/WINNT/afsd/afsd_init.c @@ -180,8 +180,8 @@ afsi_start() SetFilePointer(afsi_file, 0, NULL, FILE_END); GetTimeFormat(LOCALE_SYSTEM_DEFAULT, 0, NULL, NULL, u, sizeof(u)); - StringCbCatA(t, sizeof(t), ": Create log file\n"); - StringCbCatA(u, sizeof(u), ": Created log file\n"); + StringCbCatA(t, sizeof(t), ": Create log file\r\n"); + StringCbCatA(u, sizeof(u), ": Created log file\r\n"); WriteFile(afsi_file, t, (DWORD)strlen(t), &zilch, NULL); WriteFile(afsi_file, u, (DWORD)strlen(u), &zilch, NULL); p = "PATH="; @@ -190,7 +190,7 @@ afsi_start() code = GetEnvironmentVariable("PATH", path, code); WriteFile(afsi_file, p, (DWORD)strlen(p), &zilch, NULL); WriteFile(afsi_file, path, (DWORD)strlen(path), &zilch, NULL); - WriteFile(afsi_file, "\n", (DWORD)1, &zilch, NULL); + WriteFile(afsi_file, "\r\n", (DWORD)1, &zilch, NULL); free(path); /* Initialize C RTL Code Page conversion functions */ diff --git a/src/WINNT/afsd/cm_buf.c b/src/WINNT/afsd/cm_buf.c index 9008eafdd..4cac4385c 100644 --- a/src/WINNT/afsd/cm_buf.c +++ b/src/WINNT/afsd/cm_buf.c @@ -1612,7 +1612,7 @@ int cm_DumpBufHashTable(FILE *outputFile, char *cookie, int lock) if (lock) lock_ObtainRead(&buf_globalLock); - StringCbPrintfA(output, sizeof(output), "%s - dumping buf_HashTable - buf_hashSize=%d\n", + StringCbPrintfA(output, sizeof(output), "%s - dumping buf_HashTable - buf_hashSize=%d\r\n", cookie, cm_data.buf_hashSize); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); @@ -1622,7 +1622,7 @@ int cm_DumpBufHashTable(FILE *outputFile, char *cookie, int lock) { if (bp->refCount) { - StringCbPrintfA(output, sizeof(output), "vnode=%d, unique=%d), size=%d refCount=%d\n", + StringCbPrintfA(output, sizeof(output), "vnode=%d, unique=%d), size=%d refCount=%d\r\n", cookie, (void *)bp, i, bp->fid.cell, bp->fid.volume, bp->fid.vnode, bp->fid.unique, bp->size, bp->refCount); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); @@ -1630,7 +1630,7 @@ int cm_DumpBufHashTable(FILE *outputFile, char *cookie, int lock) } } - StringCbPrintfA(output, sizeof(output), "%s - Done dumping buf_HashTable.\n", cookie); + StringCbPrintfA(output, sizeof(output), "%s - Done dumping buf_HashTable.\r\n", cookie); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); if (lock) diff --git a/src/WINNT/afsd/cm_scache.c b/src/WINNT/afsd/cm_scache.c index ede480c90..a53432993 100644 --- a/src/WINNT/afsd/cm_scache.c +++ b/src/WINNT/afsd/cm_scache.c @@ -1549,21 +1549,21 @@ int cm_DumpSCache(FILE *outputFile, char *cookie, int lock) if (lock) lock_ObtainRead(&cm_scacheLock); - sprintf(output, "%s - dumping scache - cm_data.currentSCaches=%d, cm_data.maxSCaches=%d\n", cookie, cm_data.currentSCaches, cm_data.maxSCaches); + sprintf(output, "%s - dumping scache - cm_data.currentSCaches=%d, cm_data.maxSCaches=%d\r\n", cookie, cm_data.currentSCaches, cm_data.maxSCaches); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); for (scp = cm_data.scacheLRULastp; scp; scp = (cm_scache_t *) osi_QPrev(&scp->q)) { if (scp->refCount != 0) { - sprintf(output, "%s fid (cell=%d, volume=%d, vnode=%d, unique=%d) refCount=%u\n", + sprintf(output, "%s fid (cell=%d, volume=%d, vnode=%d, unique=%d) refCount=%u\r\n", cookie, scp->fid.cell, scp->fid.volume, scp->fid.vnode, scp->fid.unique, scp->refCount); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); } } - sprintf(output, "%s - dumping cm_data.hashTable - cm_data.hashTableSize=%d\n", cookie, cm_data.hashTableSize); + sprintf(output, "%s - dumping cm_data.hashTable - cm_data.hashTableSize=%d\r\n", cookie, cm_data.hashTableSize); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); for (i = 0; i < cm_data.hashTableSize; i++) @@ -1572,7 +1572,7 @@ int cm_DumpSCache(FILE *outputFile, char *cookie, int lock) { if (scp->refCount != 0) { - sprintf(output, "%s scp=0x%p, hash=%d, fid (cell=%d, volume=%d, vnode=%d, unique=%d) refCount=%u\n", + sprintf(output, "%s scp=0x%p, hash=%d, fid (cell=%d, volume=%d, vnode=%d, unique=%d) refCount=%u\r\n", cookie, scp, i, scp->fid.cell, scp->fid.volume, scp->fid.vnode, scp->fid.unique, scp->refCount); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); @@ -1580,7 +1580,7 @@ int cm_DumpSCache(FILE *outputFile, char *cookie, int lock) } } - sprintf(output, "%s - Done dumping scache.\n", cookie); + sprintf(output, "%s - Done dumping scache.\r\n", cookie); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); if (lock) diff --git a/src/WINNT/afsd/cm_volume.c b/src/WINNT/afsd/cm_volume.c index 261eabffb..46fb9f41a 100644 --- a/src/WINNT/afsd/cm_volume.c +++ b/src/WINNT/afsd/cm_volume.c @@ -656,7 +656,7 @@ int cm_DumpVolumes(FILE *outputFile, char *cookie, int lock) lock_ObtainRead(&cm_volumeLock); } - sprintf(output, "%s - dumping volumes - cm_data.currentVolumes=%d, cm_data.maxVolumes=%d\n", cookie, cm_data.currentVolumes, cm_data.maxVolumes); + sprintf(output, "%s - dumping volumes - cm_data.currentVolumes=%d, cm_data.maxVolumes=%d\r\n", cookie, cm_data.currentVolumes, cm_data.maxVolumes); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); for (volp = cm_data.allVolumesp; volp; volp=volp->nextp) @@ -672,14 +672,14 @@ int cm_DumpVolumes(FILE *outputFile, char *cookie, int lock) scprefs++; } - sprintf(output, "%s cell=%s name=%s rwID=%u roID=%u bkID=%u flags=0x%x fid (cell=%d, volume=%d, vnode=%d, unique=%d) refCount=%u scpRefs=%u\n", + sprintf(output, "%s cell=%s name=%s rwID=%u roID=%u bkID=%u flags=0x%x fid (cell=%d, volume=%d, vnode=%d, unique=%d) refCount=%u scpRefs=%u\r\n", cookie, volp->cellp->name, volp->namep, volp->rwID, volp->roID, volp->bkID, volp->flags, volp->dotdotFid.cell, volp->dotdotFid.volume, volp->dotdotFid.vnode, volp->dotdotFid.unique, volp->refCount, scprefs); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); } } - sprintf(output, "%s - Done dumping volumes.\n", cookie); + sprintf(output, "%s - Done dumping volumes.\r\n", cookie); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); if (lock) { diff --git a/src/WINNT/afsd/smb.c b/src/WINNT/afsd/smb.c index 9eb52de62..8eb01fd51 100644 --- a/src/WINNT/afsd/smb.c +++ b/src/WINNT/afsd/smb.c @@ -9476,94 +9476,94 @@ int smb_DumpVCP(FILE *outputFile, char *cookie, int lock) if (lock) lock_ObtainRead(&smb_rctLock); - sprintf(output, "begin dumping smb_vc_t\n"); + sprintf(output, "begin dumping smb_vc_t\r\n"); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); for (vcp = smb_allVCsp; vcp; vcp=vcp->nextp) { smb_fid_t *fidp; - sprintf(output, "%s vcp=0x%p, refCount=%d, flags=%d, vcID=%d, lsn=%d, uidCounter=%d, tidCounter=%d, fidCounter=%d\n", + sprintf(output, "%s vcp=0x%p, refCount=%d, flags=%d, vcID=%d, lsn=%d, uidCounter=%d, tidCounter=%d, fidCounter=%d\r\n", cookie, vcp, vcp->refCount, vcp->flags, vcp->vcID, vcp->lsn, vcp->uidCounter, vcp->tidCounter, vcp->fidCounter); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); - sprintf(output, "begin dumping smb_fid_t\n"); + sprintf(output, "begin dumping smb_fid_t\r\n"); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); for (fidp = vcp->fidsp; fidp; fidp = (smb_fid_t *) osi_QNext(&fidp->q)) { - sprintf(output, "%s -- smb_fidp=0x%p, refCount=%d, fid=%d, vcp=0x%p, scp=0x%p, ioctlp=0x%p, NTopen_pathp=%s, NTopen_wholepathp=%s\n", + sprintf(output, "%s -- smb_fidp=0x%p, refCount=%d, fid=%d, vcp=0x%p, scp=0x%p, ioctlp=0x%p, NTopen_pathp=%s, NTopen_wholepathp=%s\r\n", cookie, fidp, fidp->refCount, fidp->fid, fidp->vcp, fidp->scp, fidp->ioctlp, fidp->NTopen_pathp ? fidp->NTopen_pathp : "NULL", fidp->NTopen_wholepathp ? fidp->NTopen_wholepathp : "NULL"); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); } - sprintf(output, "done dumping smb_fid_t\n"); + sprintf(output, "done dumping smb_fid_t\r\n"); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); } - sprintf(output, "done dumping smb_vc_t\n"); + sprintf(output, "done dumping smb_vc_t\r\n"); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); - sprintf(output, "begin dumping DEAD smb_vc_t\n"); + sprintf(output, "begin dumping DEAD smb_vc_t\r\n"); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); for (vcp = smb_deadVCsp; vcp; vcp=vcp->nextp) { smb_fid_t *fidp; - sprintf(output, "%s vcp=0x%p, refCount=%d, flags=%d, vcID=%d, lsn=%d, uidCounter=%d, tidCounter=%d, fidCounter=%d\n", + sprintf(output, "%s vcp=0x%p, refCount=%d, flags=%d, vcID=%d, lsn=%d, uidCounter=%d, tidCounter=%d, fidCounter=%d\r\n", cookie, vcp, vcp->refCount, vcp->flags, vcp->vcID, vcp->lsn, vcp->uidCounter, vcp->tidCounter, vcp->fidCounter); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); - sprintf(output, "begin dumping smb_fid_t\n"); + sprintf(output, "begin dumping smb_fid_t\r\n"); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); for (fidp = vcp->fidsp; fidp; fidp = (smb_fid_t *) osi_QNext(&fidp->q)) { - sprintf(output, "%s -- smb_fidp=0x%p, refCount=%d, fid=%d, vcp=0x%p, scp=0x%p, ioctlp=0x%p, NTopen_pathp=%s, NTopen_wholepathp=%s\n", + sprintf(output, "%s -- smb_fidp=0x%p, refCount=%d, fid=%d, vcp=0x%p, scp=0x%p, ioctlp=0x%p, NTopen_pathp=%s, NTopen_wholepathp=%s\r\n", cookie, fidp, fidp->refCount, fidp->fid, fidp->vcp, fidp->scp, fidp->ioctlp, fidp->NTopen_pathp ? fidp->NTopen_pathp : "NULL", fidp->NTopen_wholepathp ? fidp->NTopen_wholepathp : "NULL"); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); } - sprintf(output, "done dumping smb_fid_t\n"); + sprintf(output, "done dumping smb_fid_t\r\n"); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); } - sprintf(output, "done dumping DEAD smb_vc_t\n"); + sprintf(output, "done dumping DEAD smb_vc_t\r\n"); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); - sprintf(output, "begin dumping DEAD smb_vc_t\n"); + sprintf(output, "begin dumping DEAD smb_vc_t\r\n"); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); for (vcp = smb_deadVCsp; vcp; vcp=vcp->nextp) { smb_fid_t *fidp; - sprintf(output, "%s vcp=0x%p, refCount=%d, flags=%d, vcID=%d, lsn=%d, uidCounter=%d, tidCounter=%d, fidCounter=%d\n", + sprintf(output, "%s vcp=0x%p, refCount=%d, flags=%d, vcID=%d, lsn=%d, uidCounter=%d, tidCounter=%d, fidCounter=%d\r\n", cookie, vcp, vcp->refCount, vcp->flags, vcp->vcID, vcp->lsn, vcp->uidCounter, vcp->tidCounter, vcp->fidCounter); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); - sprintf(output, "begin dumping smb_fid_t\n"); + sprintf(output, "begin dumping smb_fid_t\r\n"); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); for (fidp = vcp->fidsp; fidp; fidp = (smb_fid_t *) osi_QNext(&fidp->q)) { - sprintf(output, "%s -- smb_fidp=0x%p, refCount=%d, fid=%d, vcp=0x%p, scp=0x%p, ioctlp=0x%p, NTopen_pathp=%s, NTopen_wholepathp=%s\n", + sprintf(output, "%s -- smb_fidp=0x%p, refCount=%d, fid=%d, vcp=0x%p, scp=0x%p, ioctlp=0x%p, NTopen_pathp=%s, NTopen_wholepathp=%s\r\n", cookie, fidp, fidp->refCount, fidp->fid, fidp->vcp, fidp->scp, fidp->ioctlp, fidp->NTopen_pathp ? fidp->NTopen_pathp : "NULL", fidp->NTopen_wholepathp ? fidp->NTopen_wholepathp : "NULL"); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); } - sprintf(output, "done dumping smb_fid_t\n"); + sprintf(output, "done dumping smb_fid_t\r\n"); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); } - sprintf(output, "done dumping DEAD smb_vc_t\n"); + sprintf(output, "done dumping DEAD smb_vc_t\r\n"); WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL); if (lock) -- 2.39.5