freem/src/fma_journals.c - diff

Return to fma_journals.c CVS log

Up to [Coherent Logic Development] / freem / src

Diff for /freem/src/fma_journals.c between versions 1.4 and 1.6

version 1.4, 2025/04/09 19:52:02	version 1.6, 2025/04/17 14:34:27
Line 24	Line 24
* along with FreeM. If not, see <https://www.gnu.org/licenses/>.	* along with FreeM. If not, see <https://www.gnu.org/licenses/>.
*	*
* $Log$	* $Log$
	* Revision 1.6 2025/04/17 14:34:27 snw
	* Further logging improvements
	*
	* Revision 1.5 2025/04/13 04:22:43 snw
	* Fix snprintf calls
	*
* Revision 1.4 2025/04/09 19:52:02 snw	* Revision 1.4 2025/04/09 19:52:02 snw
* Eliminate as many warnings as possible while building with -Wall	* Eliminate as many warnings as possible while building with -Wall
*	*
Line 49	Line 55

#include "fmadm.h"	#include "fmadm.h"
#include "jnldefs.h"	#include "jnldefs.h"
	#include "log.h"

void cvt_key (char buf, char key);	void cvt_key (char buf, char key);
extern short ierr;	extern short ierr;
Line 71 int fma_journals_examine (int optc, char	Line 78 int fma_journals_examine (int optc, char
jnl_ent_t ent;	jnl_ent_t ent;

if ((fd = open (fma_journal_path, O_RDONLY)) == -1) {	if ((fd = open (fma_journal_path, O_RDONLY)) == -1) {
fprintf (stderr, "fmadm: error %d opening journal file %s (%s)\n", errno, fma_journal_path, strerror (errno));	logprintf (FM_LOG_FATAL, "fmadm: error opening journal file %s (error code %ld [%s])",fma_journal_path, errno, strerror (errno));

exit (2);
}	}

if (read (fd, &hdr, sizeof (jnl_hdr_t)) == -1) {	if (read (fd, &hdr, sizeof (jnl_hdr_t)) == -1) {
fprintf (stderr, "fmadm: error %d reading header from journal file %s (%s)\n", errno, fma_journal_path, strerror (errno));	logprintf (FM_LOG_FATAL, "fmadm: error reading header from journal file %s (error code %ld [%s])", errno, fma_journal_path, strerror (errno));

exit (3);
}	}

printf ("\nFreeM Journal Dump\n");	printf ("\nFreeM Journal Dump\n");
Line 138 int fma_journals_examine (int optc, char	Line 141 int fma_journals_examine (int optc, char

if (ent.action == JNLA_SET) {	if (ent.action == JNLA_SET) {

snprintf (dbuf, 2049, "%s=%s", kbuf, ent.data);	snprintf (dbuf, sizeof (dbuf) - 1, "%s=%s", kbuf, ent.data);

for (k = 0; k < strlen (dbuf); k++) {	for (k = 0; k < strlen (dbuf); k++) {
if (dbuf[k] == '\201') dbuf[k] = '\0';	if (dbuf[k] == '\201') dbuf[k] = '\0';
Line 167 int fma_journals_restore (int optc, char	Line 170 int fma_journals_restore (int optc, char

jnl_hdr_t hdr;	jnl_hdr_t hdr;
jnl_ent_t ent;	jnl_ent_t ent;

if ((fd = open (fma_journal_path, O_RDONLY)) == -1) {	if ((fd = open (fma_journal_path, O_RDONLY)) == -1) {
fprintf (stderr, "error: error %d opening journal file %s\n", errno, fma_journal_path);	logprintf (FM_LOG_FATAL, "fmadm: error opening journal file %s (error code %ld [%s])",fma_journal_path, errno, strerror (errno));

exit (2);
}	}

if (read (fd, &hdr, sizeof (jnl_hdr_t)) == -1) {	if (read (fd, &hdr, sizeof (jnl_hdr_t)) == -1) {
fprintf (stderr, "error: error %d reading header from journal file %s\n", errno, fma_journal_path);	logprintf (FM_LOG_FATAL, "fmadm: error reading header from journal file %s (error code %ld [%s])", errno, fma_journal_path, strerror (errno));

exit (3);
}	}

printf ("\nFreeM Journal Playback\n");	printf ("\nFreeM Journal Playback\n");

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.4
changed lines
	Added in v.1.6