Skip to content

Commit

Permalink
Added pineapple mode
Browse files Browse the repository at this point in the history
  • Loading branch information
rondilley committed Oct 3, 2024
1 parent 14c0f1d commit 61fcad4
Show file tree
Hide file tree
Showing 14 changed files with 39 additions and 21 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,7 @@

* Minor documentation changes
* Porting for for openBSD 64bit

2024-10-02 Ron Dilley <ron.dilley@uberadmin.com>

* Added support for Tom Liston PINEAPPLE mode
4 changes: 4 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,7 @@ Version 1.0.1 (March 11, 2022):
Version 1.0.2 (March 14, 2022):

* Minor porting for openBSD 64bit

Version 1.0.3 (October 2, 2024):

* Added support for Tom Liston PINEAPPLE mode
13 changes: 10 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,13 @@ AC_ARG_ENABLE(showmemdebug,
CFLAGS="${CFLAGS} -DMEM_DEBUG -DSHOW_MEM_DEBUG"
,)

PINEAPPLE="no"
AC_ARG_ENABLE(pineapple,
[ --enable-pineapple Enable Tom Liston PINEAPPLE mode],
PINEAPPLE="yes"
CFLAGS="${CFLAGS} -DPINEAPPLE"
,)

GPROF="no"
AC_ARG_ENABLE(gprof,
[ --enable-gprof Enable profiler],
Expand Down Expand Up @@ -239,11 +246,11 @@ AC_TYPE_UINT8_T
AC_STRUCT_TM
AC_STRUCT_ST_BLOCKS
AC_TYPE_OFF_T
AC_TYPE_SIGNAL

AM_CONFIG_HEADER(include/config.h)
AC_CONFIG_HEADERS([include/config.h])
AC_PROG_INSTALL
AC_OUTPUT(Makefile src/Makefile dt.1)
AC_CONFIG_FILES([Makefile src/Makefile dt.1])
AC_OUTPUT

BINDIR=`eval echo ${bindir}`; BINDIR=`eval echo ${BINDIR}`;
MANDIR=`eval echo ${mandir}/${mansubdir}`; MANDIR=`eval echo ${MANDIR}`;
Expand Down
2 changes: 1 addition & 1 deletion include/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
# include <config.h>
#endif

#include <sysdep.h>
#include "../include/sysdep.h"

#ifndef __SYSDEP_H__
# error something is messed up
Expand Down
4 changes: 2 additions & 2 deletions src/dt.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,13 @@
# include <config.h>
#endif

#include <sysdep.h>
#include "../include/sysdep.h"

#ifndef __SYSDEP_H__
# error something is messed up
#endif

#include <common.h>
#include "../include/common.h"
#include "util.h"
#include "mem.h"
#include "hash.h"
Expand Down
4 changes: 2 additions & 2 deletions src/fileHandlers.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@
# include <config.h>
#endif

#include <sysdep.h>
#include "../include/sysdep.h"

#ifndef __SYSDEP_H__
# error something is messed up
#endif

#include <stdio.h>
#include <common.h>
#include "../include/common.h"
#include "util.h"
#include "mem.h"
#include "hash.h"
Expand Down
4 changes: 2 additions & 2 deletions src/hash.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@
#include <config.h>
#endif

#include <sysdep.h>
#include "../include/sysdep.h"

#ifndef __SYSDEP_H__
#error something is messed up
#endif

#include "mem.h"
#include "util.h"
#include <common.h>
#include "../include/common.h"
#include <stdint.h>

/****
Expand Down
3 changes: 3 additions & 0 deletions src/mem.c
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,9 @@ void *xmalloc_(const int size, const char *filename, const int linenumber)
result = malloc(size);
if (result EQ NULL)
{
#ifdef PINEAPPLE
fprintf(stderr, "PINEAPPLE\n");
#endif
fprintf(stderr, "out of memory (%d at %s:%d)!\n", size, filename,
linenumber);
#ifdef MEM_DEBUG
Expand Down
4 changes: 2 additions & 2 deletions src/mem.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@
#include <config.h>
#endif

#include <sysdep.h>
#include "../include/sysdep.h"

#ifndef __SYSDEP_H__
#error something is messed up
#endif

#include <common.h>
#include "../include/common.h"

/****
*
Expand Down
4 changes: 2 additions & 2 deletions src/noftw.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@
# include <config.h>
#endif

#include <sysdep.h>
#include "../include/sysdep.h"

#ifndef __SYSDEP_H__
# error something is messed up
#endif

#include <dirent.h>
#include <common.h>
#include "../include/common.h"
#include "util.h"
#include "mem.h"

Expand Down
4 changes: 2 additions & 2 deletions src/parser.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@
# include <config.h>
#endif

#include <sysdep.h>
#include "../include/sysdep.h"

#ifndef __SYSDEP_H__
# error something is messed up
#endif

#include <common.h>
#include "../include/common.h"
#include "util.h"
#include "mem.h"

Expand Down
4 changes: 2 additions & 2 deletions src/processDir.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@
# include <config.h>
#endif

#include <sysdep.h>
#include "../include/sysdep.h"

#ifndef __SYSDEP_H__
# error something is messed up
#endif

#include <stdio.h>
#include <common.h>
#include "../include/common.h"
#if ! defined HAVE_FTW && ! defined HAVE_NFTW
# include "noftw.h"
#endif
Expand Down
4 changes: 2 additions & 2 deletions src/util.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@
# include <config.h>
#endif

#include <sysdep.h>
#include "../include/sysdep.h"

#ifndef __SYSDEP_H__
# error something is messed up
#endif

#include <common.h>
#include "../include/common.h"
#include <sys/types.h>
#include <dirent.h>
#include "mem.h"
Expand Down
2 changes: 1 addition & 1 deletion version.m4
Original file line number Diff line number Diff line change
@@ -1 +1 @@
m4_define([VERSION_NUMBER], [1.0.2])
m4_define([VERSION_NUMBER], [1.0.3])

0 comments on commit 61fcad4

Please sign in to comment.