Added credits for MacPorts Portfile design and build cleanup

This reverts commit 5283614bec, reversing
changes made to 4ecef4db08.

.gitignore

@@ -3,5 +3,7 @@
 timetest
 
 src/libfaketime.dylib.1
+src/libfaketime.1.dylib
 src/core
+src/faketime
 

Makefile

@@ -1,6 +1,7 @@
+INSTALL ?= install
+
 all:
 	$(MAKE) -C src all
-	$(MAKE) -C test all
 
 test:
 	$(MAKE) -C test all

Makefile.OSX

@@ -0,0 +1,33 @@
+INSTALL ?= install
+
+PREFIX ?= /usr/local
+
+all:
+	$(MAKE) -f Makefile.OSX -C src all
+
+test:
+	$(MAKE) -f Makefile.OSX -C test all
+
+install:
+	$(MAKE) -f Makefile.OSX -C src install
+	$(MAKE) -f Makefile.OSX -C man install
+	$(INSTALL) -dm0755 "${DESTDIR}${PREFIX}/share/doc/faketime/"
+	$(INSTALL) -m0644 README "${DESTDIR}${PREFIX}/share/doc/faketime/README"
+	$(INSTALL) -m0644 NEWS "${DESTDIR}${PREFIX}/share/doc/faketime/NEWS"
+
+uninstall:
+	$(MAKE) -f Makefile.OSX -C src uninstall
+	$(MAKE) -f Makefile.OSX -C man uninstall
+	rm -f "${DESTDIR}${PREFIX}/share/doc/faketime/README"
+	rm -f "${DESTDIR}${PREFIX}/share/doc/faketime/NEWS"
+	rmdir "${DESTDIR}${PREFIX}/share/doc/faketime"
+
+clean:
+	$(MAKE) -f Makefile.OSX -C src clean
+	$(MAKE) -f Makefile.OSX -C test clean
+
+distclean:
+	$(MAKE) -f Makefile.OSX -C src distclean
+	$(MAKE) -f Makefile.OSX -C test distclean
+
+.PHONY: all test install uninstall clean distclean

NEWS

@@ -1,3 +1,31 @@
+Since 0.9:
+    - ryandesign at MacPorts provided a Portfile for MacPorts and
+      fixed various build issues on OSX.
+    - Balint Reczey added support for nanosecond resolution, saving
+      timestamps to files, speeding up and slowing down per-process
+      timers, CLOCK_MONOTONIC and CLOCK_MONOTONIC_RAW, faketime
+      support for system calls such as sleep() and alarm().
+    - Applied a patch by Gerardo Malazdrewicz and Toni G to restore
+      compatibility with newer versions of glibc.
+    - Balint Reczey added an option to use the same global clock setting
+      for all libfaketime-spawned processes.
+    - Balint Reczey has rewritten the faketime wrapper shell script in C
+      and refactored libfaketime.
+    - Balint Reczey added support for advancing the time with each time-
+      related system call ("deterministic time").
+    - Added "timeprivacy" wrapper by adrelanos; it ensures that programs
+      are started with unique timestamps.
+    - Code and documentation cleanup by Tomi Ollila.
+    - Reworked Makefiles for more flexible installation, including fixes
+      by Lukas Fleischner, Daniel Kahm Gillmor, and Hugues Andreux.
+    - Fixed license issues as pointed out by Paul Wouters.
+    - Mac OS X support has been improved for OS X 10.7 and 10.8; due to
+      changes to the underlying libraries on OS X, libfaketime 0.9.5 will
+      no longer work with OS X < 10.6; use libfaketime 0.9(.1) for older
+      OS X installations.
+    - Don Fong has contributed a new framework for functional tests.
+      Petr Salinger ensured its compatibility with GNU/kFreeBSD.
+
 Since 0.8.2:
     - Added support for "limited faking".
       You can optionally specify when libfaketime starts to fake the
@@ -5,11 +33,11 @@ Since 0.8.2:
       a program can be started regularly, and after 5 minutes run-time
       it will be sent two years into the future. Those limiting
       start and stop times can be specified in seconds or as the
-      number of any time-related function calls within the program. 
+      number of any time-related function calls within the program.
     - Added a feature to spawn an external process after x seconds
       or y time-related system calls. This can, for example, be used
       to execute an arbitrary shell script x seconds after a program
-      has been started. 
+      has been started.
 
 Since 0.8.1:
     - Added a MacOS port.
@@ -88,4 +116,3 @@ Since 0.2:
 Since 0.1:
     - Fixed segfault when calling time(NULL). Thanks to Andres Ojamaa!
     - Added additional sanity checks.
-

README

@@ -1,6 +1,7 @@
-      =====================================================
-      FakeTime Preload Library, version 0.9 (February 2011)
-      =====================================================
+      =======================================================
+             libfaketime, version 0.9.5 (October 2013)
+        (previously also know as FakeTime Preload Library)
+      =======================================================
 
 
 Content of this file:
@@ -19,6 +20,7 @@ Content of this file:
    g) Using the "faketime" wrapper script
    h) "Limiting" libfaketime
    i) Spawning an external process
+   j) Saving timestamps to file, loading them from file
 5. License
 6. Contact
 
@@ -27,35 +29,35 @@ Content of this file:
 1. Introduction
 ---------------
 
-FTPL intercepts various system calls which programs use to retrieve the 
-current date and time. It can then report faked dates and times (as 
-specified by you, the user) to these programs. This means you can modify
-the system time a program sees without having to change the time system-
-wide.
+libfaketime intercepts various system calls which programs use to
+retrieve the current date and time. It can then report faked dates and times
+(as specified by you, the user) to these programs. This means you can modify
+the system time a program sees without having to change the time system-wide.
 
-FTPL allows you to specify both absolute dates (e.g., 01/01/2004) and 
+libfaketime allows you to specify both absolute dates (e.g., 01/01/2004) and
 relative dates (e.g., 10 days ago).
 
-FTPL might be used for various purposes, for example
+libfaketime might be used for various purposes, for example
 
 - running legacy software with y2k bugs
 - testing software for year-2038 compliance
 - debugging time-related issues, such as expired SSL certificates
 - running software which ceases to run outside a certain timeframe
-- using different system-wide date and time settings, e.g. on OpenVZ-
-  based virtual machines running on the same host
+- using different system-wide date and time settings, e.g., on OpenVZ-
+  based virtual machines running on the same host.
 
 
 
 2. Compatibility issues
 -----------------------
 
-* FTPL has been designed on and for Linux 2.x, but is supposed and has been 
-  reported to work on other *NIXes as well. 
+* libfaketime has been designed on and for Linux, but is supposed and has been
+  reported to work on other *NIXes as well, including Mac OS X.
 
-* FTPL uses the library preload mechanism and thus cannot work with statically
-  linked binaries or binaries that have the setuid-flag set (e.g., suidroot
-  programs like "ping" or "passwd"). 
+* libfaketime uses the library preload mechanism and thus cannot work with
+  statically linked binaries or binaries that have the setuid-flag set (e.g.,
+  suidroot programs like "ping" or "passwd"). Please see you system linker's
+  manpage for further details (man ld).
 
 * As of version 0.7, support has been added for use in a pthreads environment. A
   separate library is built (libfaketimeMT.so.1) which contains the pthread
@@ -74,23 +76,37 @@ FTPL might be used for various purposes, for example
   required for Java with faked times in the future. Thanks to Jamie Cameron for
   reporting this issue and finding a workaround!
 
+* libfaketime will eventually be bypassed by applications that dynamically load
+  system libraries, such as librt, explicitly themselves instead of relying on
+  the linker to do so at application start time. libfaketime will not work with
+  those applications unless you can modify them.
+
+* Applications can explicitly be designed to prevent libfaketime from working,
+  e.g., by checking whether certain environment variables are set or whether
+  libfaketime-specific files are present.
+
+
 
 3. Installation
 ---------------
 
 Running "make" should compile both library versions and a test program, which
-it then also executes. 
+it then also executes.
 
-If the test works fine, you should copy the FTPL libraries (libfaketime.so.1,
-and libfaketimeMT.so.1) to the place you want them in. Running "make install" 
-will attempt to place them in /usr/local/lib/faketime and will install the wrapper 
-shell script "faketime" in /usr/local/bin, both of which most likely will require
-root privileges; however, from a technical point of view, there is no 
-necessity for a system-wide installation, so you can use FTPL also on machines
-where you do not have root privileges. You may want to adjust the PREFIX 
-variable in the Makefiles accordingly.
+If the test works fine, you should copy the libfaketime libraries
+(libfaketime.so.1, and libfaketimeMT.so.1) to the place you want them in.
+Running "make install" will attempt to place them in /usr/local/lib/faketime
+and will install the wrapper shell script "faketime" in /usr/local/bin, both of
+which most likely will require root privileges; however, from a technical point
+of view, there is no necessity for a system-wide installation, so you can use
+libfaketime also on machines where you do not have root privileges. You may want 
+to adjust the PREFIX variable in the Makefiles accordingly.
 
-Since version 0.6, system calls to file timestamps are also intercepted now,
+By default, the Makefile compiles/links libfaketime for your default system
+architecture. If you need to build, e.g., 32-bit files on a 64-bit platform,
+please see the notes about CFLAGS and LDFLAGS in src/Makefile.
+
+Since version 0.6, system calls to file timestamps are also intercepted,
 thanks to a contribution by Philipp Hachtmann. This is especially useful in
 combination with relative time offsets as explained in section 4d) below, if a
 program writes and reads files whose timestamps also shall be faked. If you do
@@ -98,12 +114,15 @@ not need this feature or if it confuses the application you want to use FTPL
 with, define the environment variable NO_FAKE_STAT, and the intercepted stat
 calls will be passed through unaltered.
 
-On MacOS, it is necessary to compile differently, due to the different
+On OS X, it is necessary to compile differently, due to the different
 behavior dyld has. Use the Makefile.MacOS provided to compile
-libfaketime.dylib.1. Additionally, instead of using LD_PRELOAD,
+libfaketime.1.dylib. Additionally, instead of using LD_PRELOAD,
 the variable DYLD_INSERT_LIBRARIES should be set to the path to
-libfaketime.dylib.1, and the variable DYLD_FORCE_FLAT_NAMESPACE should be
-set (to anything).
+libfaketime.1.dylib, and the variable DYLD_FORCE_FLAT_NAMESPACE should be
+set (to anything). Mac OS X users should read README.OSX for additional
+details.
+
+
 
 4. Usage
 --------
@@ -111,14 +130,14 @@ set (to anything).
 4a) Usage basics
 ----------------
 
-Using FTPL on a program of your choice consists of two steps:
+Using libfaketime on a program of your choice consists of two steps:
 
-1. Making sure FTPL gets loaded.
+1. Making sure libfaketime gets loaded by the system's linker.
 2. Specify the faked time.
 
 
 As an example, we want the "date" command to report our faked time. To do so,
-we could use the following command line:
+we could use the following command line on Linux:
 
 user@host> date
 Tue Nov 23 12:01:05 CEST 2007
@@ -127,9 +146,10 @@ user@host> LD_PRELOAD=/usr/local/lib/libfaketime.so.1 FAKETIME="-15d" date
 Mon Nov  8 12:01:12 CEST 2007
 
 
-The basic way of running any command/program with FTPL enabled is to make sure
-the environment variable LD_PRELOAD contains the full path and filename of the
-FTPL library. This can either be done by setting it once beforehand:
+The basic way of running any command/program with libfaketime enabled is to
+make sure the environment variable LD_PRELOAD contains the full path and
+filename of the libfaketime library. This can either be done by setting it once
+beforehand:
 
 export LD_PRELOAD=/path/to/libfaketime.so.1
 (now run any command you want)
@@ -139,31 +159,31 @@ Or it can be done by specifying it on the command line itself:
 
 LD_PRELOAD=/path/to/libfaketime.so.1 your_command_here
 
-(These examples are for the bash shell; how environment variables are set may 
+(These examples are for the bash shell; how environment variables are set may
 vary on your system.)
 
 
-However, also the faked time should be specified; otherwise, FTPL will be 
-loaded, but just report the real system time. There are three ways to specify
-the faked time:
+However, also the faked time should be specified; otherwise, libfaketime
+will be loaded, but just report the real system time. There are three
+ways to specify the faked time:
 
 a) By setting the environment variable FAKETIME.
 b) By using the file .faketimerc in your home directory.
 c) By using the file /etc/faketimerc for a system-wide default.
 
-If you want to use b) or c), $HOME/.faketimerc or /etc/faketimerc consist of 
-only one line of text with exactly the same content as the FAKETIME environment 
+If you want to use b) or c), $HOME/.faketimerc or /etc/faketimerc consist of
+only one line of text with exactly the same content as the FAKETIME environment
 variable, which is described below. Note that /etc/faketimerc will only be used
 if there is no $HOME/.faketimerc, and the FAKETIME environment variable always
 has priority over the files.
 
-   
+
 4b) Using absolute dates
 ------------------------
 
-The format which _must_ be used for _absolute_ dates is "YYYY-MM-DD hh:mm:ss". 
+The format which _must_ be used for _absolute_ dates is "YYYY-MM-DD hh:mm:ss".
 For example, the 24th of December, 2002, 8:30 PM would have to be specified as
-FAKETIME="2002-12-24 20:30:00". 
+FAKETIME="2002-12-24 20:30:00".
 
 
 4c) Using 'start at' dates
@@ -171,9 +191,9 @@ FAKETIME="2002-12-24 20:30:00".
 
 (Thanks to a major contribution by David North, TDI in version 0.7)
 
-The format which _must_ be used for _start_at_ dates is "@YYYY-MM-DD hh:mm:ss". 
+The format which _must_ be used for _start_at_ dates is "@YYYY-MM-DD hh:mm:ss".
 For example, the 24th of December, 2002, 8:30 PM would have to be specified as
-FAKETIME="@2002-12-24 20:30:00". 
+FAKETIME="@2002-12-24 20:30:00".
 
 The absolute dates described in 4b simulate a STOPPED system clock at the
 specified absolute time. The 'start at' format allows a 'relative' clock
@@ -188,14 +208,14 @@ Relative date offsets can be positive or negative, thus what you put into
 FAKETIME _must_ either start with a + or a -, followed by a number, and
 optionally followed by a multiplier:
 
-- by default, the offset you specify is in seconds. Example: 
-  
+- by default, the offset you specify is in seconds. Example:
+
   export FAKETIME="-120" will set the faked time 2 minutes (120 seconds) behind
   the real time.
-  
-- the multipliers "m", "h", "d" and "y" can be used to specify the offset in 
+
+- the multipliers "m", "h", "d" and "y" can be used to specify the offset in
   minutes, hours, days and years (365 days each), respectively. Examples:
-  
+
   export FAKETIME="-10m" sets the faked time 10 minutes behind the real time.
   export FAKETIME="+14d" sets the faked time to 14 days in the future.
 
@@ -211,7 +231,7 @@ Moreno Baricevic has contributed support for the FAKETIME_FMT environment
 variable, which allows to optionally set the strptime() format:
 
 Some simple examples:
-LD_PRELOAD=./libfaketime.so.1 FAKETIME_FMT=%s FAKETIME="`date +%s -d'1 year ago'`" date 
+LD_PRELOAD=./libfaketime.so.1 FAKETIME_FMT=%s FAKETIME="`date +%s -d'1 year ago'`" date
 LD_PRELOAD=./libfaketime.so.1 FAKETIME_FMT=%s FAKETIME="`stat -c %Y somefile`" date
 LD_PRELOAD=./libfaketime.so.1 FAKETIME_FMT=%c FAKETIME="`date`" date
 
@@ -232,11 +252,13 @@ depends on your locale settings, so actually you might need to use
 
 FAKETIME="+1.5h"
 
-You should figure out the proper delimiter, e.g. by using FTPL on a command
-like /bin/date where you immediately can verify whether it worked as expected.
+You should figure out the proper delimiter, e.g. by using libfaketime on
+a command like /bin/date where you immediately can verify whether it worked as
+expected.
 
-Also contributed by Karl Chen in v0.8 is the option to speed up or slow down
-the wall clock time for the program which is executed using FTPL. For example,
+Also contributed by Karl Chen in v0.8 is the option to speed up or slow
+down the wall clock time for the program which is executed using libfaketime.
+For example,
 
 FAKETIME="+1y x2"
 
@@ -246,39 +268,50 @@ twice as fast. Similarly,
 FAKETIME="+1y x0,5"
 
 will make the clock run only half as fast. As stated above, the fraction
-delimiter depends on your locale. 
+delimiter depends on your locale.
+
+FAKETIME="+1y i2,0"
+
+will make the clock step two seconds per each time(), etc. call, running
+completely independently of the system clock. It helps running programs
+with some determinism. In this single case all spawned processes will use
+the same global clock without restaring it at the start of each process.
 
 For testing, your should run a command like
 
 LD_PRELOAD=./libfaketime.so.1 FAKETIME="+1,5y x10,0" \
 /bin/bash -c 'while true; do echo $SECONDS ; sleep 1 ; done'
 
-For each second that the endless loop sleeps, the executed bash shell will 
-think that 10 seconds have passed ($SECONDS is a bash-internal variable 
+For each second that the endless loop sleeps, the executed bash shell will
+think that 10 seconds have passed ($SECONDS is a bash-internal variable
 measuring the time since the shell was started).
 
 (Please note that replacing "echo $SECONDS" e.g. with a call to "/bin/date"
 will not give the expected result, since /bin/date will always be started
 as a new process for which also FTPL will be re-initialized. It will show
-the correct offset (1.5 years in the future), but no speed-ups or 
+the correct offset (1.5 years in the future), but no speed-ups or
 slow-downs.)
 
+For applications that should use a different date & time each time they are
+run, consider using the included timeprivacy wrapper shellscript (contributed
+by adrelanos at riseup dot net).
+
 
 Caveats:
 --------
 
-Whenever possible, you should use relative offsets or 'start at' dates, and not
-use absolute dates.
+Whenever possible, you should use relative offsets or 'start at' dates,
+and not use absolute dates.
 
-Why? Because the absolute date/time you set is fixed, i.e. if a program
-retrieves the current time, and retrieves the current time again 5 minutes
-later, it will still get the same result twice. This is likely to break
-programs which measure the time passing by (e.g. a mail program which checks
+Why? Because the absolute date/time you set is fixed, i.e., if a program
+retrieves the current time, and retrieves the current time again 5
+minutes later, it will still get the same result twice. This is likely to break
+programs which measure the time passing by (e.g., a mail program which checks
 for new mail every X minutes).
 
-Using relative offsets or 'start at' dates solves this problem. FTPL then will
-always report the faked time based on the real current time and the offset
-you've specified. 
+Using relative offsets or 'start at' dates solves this problem.
+libfaketime then will always report the faked time based on the real
+current time and the offset you've specified.
 
 Please also note that your specification of the fake time is cached for 10
 seconds in order to enhance the library's performance. Thus, if you change the
@@ -291,22 +324,31 @@ command line option -DNO_CACHING to this library's Makefile.
 4f) Faking the date and time system-wide
 ----------------------------------------
 
-David Burley of SourceForge, Inc. reported an interesting use case of applying 
-FTPL system-wide: Currently, all virtual machines running inside an OpenVZ host 
-have the same system date and time. In order to use multiple sandboxes with 
-different system dates, the FTPL library can be put into /etc/ld.so.preload; 
-it will then be applied to all commands and programs automatically. This is
-of course best used with a system-wide /etc/faketimerc file. Kudos to 
-SourceForge, Inc. for providing the patch!
+David Burley of SourceForge, Inc. reported an interesting use case of applying
+libfaketime system-wide: Currently, all virtual machines running inside
+an OpenVZ host have the same system date and time. In order to use multiple
+sandboxes with different system dates, the libfaketime library can be put into
+/etc/ld.so.preload; it will then be applied to all commands and programs
+automatically. This is of course best used with a system-wide /etc/faketimerc
+file. Kudos to SourceForge, Inc. for providing the patch!
+
+Caveat: If you run a virtual machine, its real-time clock might be reset to the
+real world date & time when you reboot. Depending on your FAKETIME setting,
+this may lead to side effects, such as forced file system checks on each reboot.
+System-wide faked time may also lead to unexpected side effects with software
+auto-update tools, if the offset between real world time and faked system time
+is too large. If in doubt, set your system's date to the faked time and try out
+whether everything still works as expected before applying libfaketime
+system-wide.
 
 
-4g) Using the "faketime" wrapper script
----------------------------------------
+4g) Using the "faketime" wrapper
+--------------------------------
 
-As of version 0.8, FTPL provides a shell script named "faketime" which is
+As of version 0.8, libfaketime provides a command named "faketime", which is
 placed into /usr/bin by "make install". It spares the hassle of setting
 the LD_PRELOAD and FAKETIME environment variables manually, but only exposes
-a subset of FTPL's functionality. On the other hand, it uses the date
+a subset of libfaketime's functionality. On the other hand, it uses the date
 interpretation function by /bin/date in order to provide higher flexibility
 regarding the specification of the faked date and time. For example, you
 can use
@@ -319,12 +361,15 @@ faketime '2008-12-24 08:15:42' /bin/date
 
 Thanks to Daniel Kahn Gillmor for providing these suggestions!
 
+Balint Reczey has rewritten the wrapper in 0.9.5 from a simple shell script
+to an efficient wrapper application.
+
 
 4h) "Limiting" libfaketime
 --------------------------
 
 Starting with version 0.9, libfaketime can be configured to not be continuously
-active, but only during a certain time interval. 
+active, but only during a certain time interval.
 
 For example, you might want to start a program with the real current time, but
 after 5 minutes of usage, you might want it to see a faked time, e.g., a year
@@ -340,7 +385,7 @@ Dynamic changes to the faked time are alternatively possible by
 - not using the FAKETIME environment variable, but specifying the fake time in a
   file (such as ~/.faketimerc). You can change the content of this file at
   run-time. This works best with caching disabled (see Makefile), but comes at a
-  performance cost because this file has to be read and evaluated each time. 
+  performance cost because this file has to be read and evaluated each time.
 
 The feature described here works based on two pairs of environment variables,
 
@@ -348,7 +393,7 @@ The feature described here works based on two pairs of environment variables,
   FAKETIME_START_AFTER_NUMCALLS and FAKETIME_STOP_AFTER_NUMCALLS
 
 The default value for each of these environment variables is -1, which means
-"ignore this value". 
+"ignore this value".
 
 If you want libfaketime to be only active during the run-time minutes 2 to 5
 of your application, you would set
@@ -359,7 +404,7 @@ of your application, you would set
 This means that your application will work with the real time from start (second
 0) up to second 60. It will then see a faked time from run-time seconds 60 to
 300 (minutes 2, 3, 4, and 5). After run-time second 600, it will again see the
-real (not-faked) time. 
+real (not-faked) time.
 
 This approach is not as flexible as changing the FAKETIME environment variable
 during runtime, but may be easier to use, works on a per-program (and not a
@@ -368,9 +413,9 @@ per-user or system-wide) scope, and has only a minor performance overhead.
 Using the other pair of environment variables, you can limit the activity time
 of libfaketime not based on wall-clock seconds, but on the number of
 time-related function calls the started program performs. This alternative is
-probably only suitable for programmers who either know the code of the program 
-in order to determine useful start/stop values or want to perform fuzzing 
-tests. 
+probably only suitable for programmers who either know the code of the program
+in order to determine useful start/stop values or want to perform fuzzing
+tests.
 
 Both pairs of environment variables can be combined to further restrict
 libfaketime activity, although this is only useful in very few scenarios.
@@ -379,9 +424,9 @@ Limiting libfaketime activity in this way is not recommended in general. Many
 programs will break when they are subject to sudden changes in time, especially
 if they are started using the current (real) time and are then sent back into
 the past after, e.g., 5 minutes. For example, they may appear to be frozen or
-stuck because they are waiting until a certain point in time that, however, is 
-never reached due to the delayed libfaketime activity. Avoid using this 
-functionality unless you are sure you really need it and know what you are 
+stuck because they are waiting until a certain point in time that, however, is
+never reached due to the delayed libfaketime activity. Avoid using this
+functionality unless you are sure you really need it and know what you are
 doing.
 
 
@@ -401,7 +446,7 @@ program started. This has two limitations one needs to be aware of:
 * The original program is blocked until the external process is finished,
   because the intercepting time-related system call will not return earlier. If
   you need to start a long-running external process, make sure it forks into the
-  background. 
+  background.
 
 Spawning the external process is controlled using three environment variables:
 FAKETIME_SPAWN_TARGET, FAKETIME_SPAWN_SECONDS, FAKETIME_SPAWN_NUMCALLS.
@@ -415,24 +460,43 @@ export FAKETIME_SPAWN_SECONDS=5
 
 This will run the "echo" command with the given parameter during the first
 time-related system function call that "myprogram" performs after running for 5
-seconds. 
+seconds.
+
+
+4j) Saving timestamps to file, loading them from file
+-----------------------------------------------------
+
+Faketime can save faked timestamps to a file specified by FAKETIME_SAVE_FILE
+environment variable. It can also use the file specified by FAKETIME_LOAD_FILE
+to replay timestamps from it. After consuming the whole file, libfaketime
+returns to using the rule set in FAKETIME variable, but the timestamp processes
+will start counting from will be the last timestamp in the file.
+
+The file stores each timestamp in a stream of saved_timestamp structs
+without any metadata or padding:
+
+/* Storage format for timestamps written to file. Big endian. */
+struct saved_timestamp {
+  int64_t sec;
+  uint64_t nsec;
+};
+
+Faketime needs to be run using the faketime wrapper to use these files. This
+functionality has been added by Balint Reczey in v0.9.5.
 
 
 5. License
 ----------
 
-FTPL has been released under the GNU Public License, GPL. Please see the
+libfaketime has been released under the GNU Public License, GPL. Please see the
 included COPYING file.
 
 
-
 6. Contact
 -----------
 
-Bug reports, feature suggestions, success reports and patches are highly
-appreciated.
+Bug reports, feature suggestions, success reports, and patches/pull
+requests are highly appreciated:
 
-Please send an email to: wolf /at/ code-wizards.com
-
-git pull requests are welcome, see https://github.com/wolfcw/libfaketime
+            https://github.com/wolfcw/libfaketime
 

README.OSX

@@ -1,8 +1,16 @@
 README file for libfaketime on Mac OS X
 =======================================
 
-Support for Mac OS X is still preliminary. Development and tests are
-done under 10.7 Lion only currently.
+Support for Mac OS X is still considered preliminary, although many
+command line and GUI applications will run stable.
+
+Developments and tests are done on OSX 10.8+ currently, although the
+current version will also work with OSX 10.7.
+
+Version 0.9.5 no longer works with OSX < 10.6 due to changes in the
+underlying system libraries. If you need libfaketime on OSX < 10.6,
+please use libfaketime version 0.9.
+
 
 Compiling and using libfaketime on OS X is slightly different than
 on Linux. Please make sure to read the README file for general
@@ -17,24 +25,24 @@ Use the OSX-specific Makefiles that are provided, e.g.:
 cd src/
 make -f Makefile.MacOS
 
-The resulting library will be named libfaketime.dylib.1
+The resulting library will be named libfaketime.1.dylib
 
 
 2) Using libfaketime from the command line on OS X
 --------------------------------------------------
 
-You will need to set three environment variables. In a Terminal.app 
+You will need to set three environment variables. In a Terminal.app
 or iTerm session, the following commands can be used:
 
 export DYLD_FORCE_FLAT_NAMESPACE=1
-export DYLD_INSERT_LIBRARIES=/path/to/libfaketime.dylib.1
+export DYLD_INSERT_LIBRARIES=/path/to/libfaketime.1.dylib
 export FAKETIME="your favorite faketime-spec here"
 
 Please refer to the general README file concerning the format
 of the FAKETIME environment variable value and other environment
 variables that are related to it.
 
-The "faketime" wrapper shell script has been adapted to OS X;
+The "faketime" wrapper application has been adapted to OS X;
 it offers the same limited libfaketime functionality as on Linux
 in a simple-to-use manner without the need to manually set
 those environment variables.
@@ -44,9 +52,10 @@ those environment variables.
 --------------------------------------------
 
 Given the limited number of system calls libfaketime intercepts,
-it does not work too well with GUI applications on OS X. Crashes
-after a random time are common issues, some applications will
-not or at least not always see the faked time, and so on.
+it may not work too well with specific GUI applications on OS X.
+This can result in crashes after a seemingly random time, or an
+application will not or at least not always see the faked time,
+and so on.
 
 A safe way to try out whether a specific application works fine
 with libfaketime is to start it from the command line. Perform
@@ -59,7 +68,7 @@ following command:
 the name of your actual application.)
 
 If it works fine, you can configure the application to permanently
-run with libfaketime by editing its Info.plist file. Add the 
+run with libfaketime by editing its Info.plist file. Add the
 LSEnvironment key unless it is already there and add a dictionary
 with the three keys like this:
 
@@ -68,7 +77,7 @@ with the three keys like this:
         <key>DYLD_FORCE_FLAT_NAMESPACE</key>
         <string>1</string>
         <key>DYLD_INSERT_LIBRARIES</key>
-        <string>/path/to/libfaketime.dylib.1</string>
+        <string>/path/to/libfaketime.1.dylib</string>
         <key>FAKETIME</key>
         <string>value of FAKETIME here</string>
     </dict>
@@ -84,10 +93,16 @@ Afterwards, you will probably need to run
 
 to make sure the change to Info.plist does not go unnoticed.
 
-Please note that modifications to Info.plist will be lost when the 
-application is updated, so this process needs to be repeated after 
+Please note that modifications to Info.plist will be lost when the
+application is updated, so this process needs to be repeated after
 such updates, including own new builds when using Xcode.
 
+Please feel free to report non-working applications on the Github
+libfaketime issues website. This may help us to identify further
+time-related system calls that need to be intercepted on OSX.
+
+    https://github.com/wolfcw/libfaketime/issues
+
 
 4) Notes for developers of OS X applications
 --------------------------------------------
@@ -95,4 +110,3 @@ such updates, including own new builds when using Xcode.
 The environment variable FAKETIME can be changed at application run-time
 and always takes precedence over other user-controlled settings. It can
 be re-set to 0 (zero) to work around potential incompatibilities.
-

README.developers

@@ -0,0 +1,106 @@
+This file contains information for libfaketime developers and contributors.
+
+
+GENERAL
+=======
+
+Starting with libfaketime v0.9.5, development and issue handling is 
+completely done via Github: 
+
+	https://github.com/wolfcw/libfaketime
+
+- Official releases are tagged. 
+- Code contributions and bugfixes are merged into the "development" branch, 
+  which is considered unstable and may contain code that is not yet fully 
+  tested.
+- The "master" branch is updated with tested code only; it is ensured that
+  it compiles and works cleanly at least on current Linux and OS X systems.
+
+Code contributions are highly welcome, preferrably via pull requests on Github.
+
+
+CODE STYLE
+==========
+
+Please try to stick to the following code formatting style guidelines:
+
+- No tabs, only spaces for indentation.
+- Avoid trailing whitespace.
+- Indentation is 2 spaces for each level.
+- Opening and closing curly brackets have to be on lines of their own.
+- Use under_score_names for function and variable names; avoid using camelCase.
+- // and /*...*/ style comments may and shall be used.
+
+Example:
+
+/* This function will do nothing */
+void do_nothing(int how_often)
+{
+  int counter;
+  for (counter = 0; counter < how_often; counter++)
+  {
+    counter = counter; // our do-nothing algorithm
+  }
+}
+
+- Use -DDEBUG and #ifdef DEBUG for development and testing. Avoid printing
+  to stdout or stderr outside "#ifdef DEBUG"; if it is necessary to inform
+  the user a run-time, prefix your output with "faketime" or make otherwise
+  sure that the user knows where the message is coming from.  
+
+- If you add new functions to libfaketime.c, try placing them somewhere
+  where they fit will: Usually, functions are grouped by functionality
+  (e.g., all functions related to faking file timestamps). If that's not
+  possible, group them by contributor, or document your placement strategy
+  in the commit message. 
+
+
+DEVELOPMENT, BUILDING, AND TESTING
+==================================
+
+- Don't break existing behaviour. Backward compatibility matters (unless
+  the modification fixes bugs :-)).
+
+- Add tests for new features. Extend test/timetest.c appropriately and
+  try to use the functional testing framework wherever possible. 
+
+- Compiler and linker warnings are treated as errors and not acceptable.
+
+- If you cannot test the code on both Linux and OS X yourself, please 
+  let us know and consider wrapping your code in #ifdef / #ifndef __APPLE__ 
+  statements. 
+
+
+DOCUMENTATION
+=============
+
+For anything more than small bugfixes, please update the user documentation 
+and credits appropriately:
+
+- The NEWS file should mention the change and your credits.
+- The README and README.OSX files should be updated whenever functionality
+  is added or modified.
+- The manpage man/faketime.1 should be updated when the wrapper application
+  is modified.
+
+For credits, please either mention your real name, your Github username, or 
+your email address. 
+
+In your own interest, please be verbose on user documentation and comments
+in the source code. Users will not know about new features unless they are
+documented. Other authors and maintainers will need to understand your code
+easily.
+
+
+RELEASES
+========
+
+Official new releases are created whenever a significant amount of changes
+(bugfixes or new functionality) has piled up; on average, there is one new
+official release per year. Users who need to stick to the bleeding edge
+are supposed to use the current state of the "master" branch at any time.
+
+libfaketime maintainers for several Linux distributions are informed about
+release candidates and new releases by email. Contact wolfcw on Github if
+you are interested in receiving notifications, or use Github functionality
+to get informed about updates.

TODO

@@ -1,7 +1,8 @@
 Open issues / next steps for libfaketime development
 
 - add more functional tests that check more than the basic functionality
-- use the new testing framework to also implement unit tests
+- use the testing framework to also implement unit tests
 - make the new "limiting" and "spawning" features more flexible to use
   and available through the wrapper shell script
-
+- fake timer_create and friends
+- handle CLOCK_REALTIME_COARSE and CLOCK_MONOTONIC_COARSE

man/Makefile

@@ -1,6 +1,6 @@
-INSTALL = install
+INSTALL ?= install
 
-PREFIX = /usr/local
+PREFIX ?= /usr/local
 
 all:
 

man/Makefile.OSX

@@ -0,0 +1,15 @@
+INSTALL ?= install
+
+PREFIX ?= /usr/local
+
+all:
+
+install:
+	$(INSTALL) -dm0644 "${DESTDIR}${PREFIX}/share/man/man1"
+	$(INSTALL) -m0644 faketime.1 "${DESTDIR}${PREFIX}/share/man/man1/faketime.1"
+	gzip -f "${DESTDIR}${PREFIX}/share/man/man1/faketime.1"
+
+uninstall:
+	rm -f "${DESTDIR}${PREFIX}/share/man/man1/faketime.1.gz"
+
+.PHONY: all install uninstall

man/faketime.1

@@ -1,4 +1,4 @@
-.TH FAKETIME "1" "August 2008" "faketime 0.8" W.Hommel
+.TH FAKETIME "1" "October 2013" "faketime 0.9.5" wolfcw
 .SH NAME
 faketime \- manipulate the system time for a given command
 .SH SYNOPSIS
@@ -8,10 +8,10 @@ faketime \- manipulate the system time for a given command
 .\" \fIfaketime\fR will trick the given program into seeing the specified timestamp as its starting date and time.
 .PP
 The given command will be tricked into believing that the current system time is the one specified in the timestamp. The wall clock will continue to run
-from this date and time unless specified otherwise (see advanced options). Actually, faketime is a simple wrapper for libfaketime, which uses the LD_PRELOAD 
+from this date and time unless specified otherwise (see advanced options). Actually, faketime is a simple wrapper for libfaketime, which uses the LD_PRELOAD
 mechanism to load a small library which intercepts system calls to functions such as
 \fItime(2)\fR and \fIfstat(2)\fR. This wrapper exposes only a subset of libfaketime's functionality; please refer to the README file that came with faketime
-for more details and advanced options. 
+for more details and advanced options, or have a look at http://github.com/wolfcw/libfaketime
 .SH OPTIONS
 .TP
 \fB\-\-help\fR
@@ -32,38 +32,41 @@ faketime 'last Friday 5 pm' /bin/date
 faketime '2008-12-24 08:15:42' /bin/date
 faketime -f '+2,5y x10,0' /bin/bash -c 'date; while true; do echo $SECONDS ; sleep 1 ; done'
 faketime -f '+2,5y x0,50' /bin/bash -c 'date; while true; do echo $SECONDS ; sleep 1 ; done'
+faketime -f '+2,5y i2,0' /bin/bash -c 'while true; do date ; sleep 1 ; done'
+In this single case all spawned processes will use the same global clock without restaring it at the start of each process.
+
 (Please note that it depends on your locale settings whether . or , has to be used for fractional offsets)
 .fi
 .SH ADVANCED TIMESTAMP FORMAT
 The simple timestamp format used by default applies the \fB/bin/date -d\fR command to parse user-friendly specifications such as 'last friday'. When using
 the faketime option \fB\-f\fR, the timestamp specified on the command line is directly passed to libfaketime, which enables a couple of additional features
-such as speeding the clock up or slowing it down for the target program. It is strongly recommended that you have a look at the README file that came with
-faketime for the details. Summary:
+such as speeding the clock up or slowing it down for the target program. It is strongly recommended that you have a look at the libfaketime documentation. Summary:
 .TP
 Freeze clock at absolute timestamp: \fB"YYYY-MM-DD hh:mm:ss"\fR
 If you want to specify an absolute point in time, exactly this format must be used. Please note that freezing the clock is usually not what you want and may break the application. Only use if you know what you're doing!
 .TP
 Relative time offset: \fB"[+/-]123[m/h/d/y]\fR, e.g. "+60m", "+2y"
-This is the most often used format and specifies the faked time relatively to the current real time. The first character of the format string \fBmust\fR be a + or a -. The numeric value by default represents seconds, but the modifiers m, h, d, and y can be used to specify minutes, hours, days, or years, respectively. For example, "-2y" means "two years ago". Fractional time offsets can be used, e.g. "+2,5y", which means "two and a half years in the future". Please note that the fraction delimiter depends on your locale settings, so if "+2,5y" does not work, you might want to try "+2.5y". 
+This is the most often used format and specifies the faked time relatively to the current real time. The first character of the format string \fBmust\fR be a + or a -. The numeric value by default represents seconds, but the modifiers m, h, d, and y can be used to specify minutes, hours, days, or years, respectively. For example, "-2y" means "two years ago". Fractional time offsets can be used, e.g. "+2,5y", which means "two and a half years in the future". Please note that the fraction delimiter depends on your locale settings, so if "+2,5y" does not work, you might want to try "+2.5y".
 .TP
 Start-at timestamps: \fB"@YYYY-MM-DD hh:mm:ss"\fR
-The wall clock will start counting at the given timestamp for the program. This can be used for specifying absolute timestamps without freezing the clock. 
+The wall clock will start counting at the given timestamp for the program. This can be used for specifying absolute timestamps without freezing the clock.
 .SH ADVANCED USAGE
-When using relative time offsets or start-at timestamps (see ADVANCED TIMESTAMP FORMAT above and option \fB\-f\fR), the clock speed can be adjusted, i.e. time may run faster or slower for the executed program. For example, \fB"+5y x10"\fR will set the faked time 5 years into the future and make the time pass 10 times as fast (one real second equals 10 seconds measured by the program). Similarly, the flow of time can be slowed, e.g. using \fB"-7d x0,2"\fR, which will set the faked time 7 days in the past and set the clock speed to 20 percent, i.e. it takes five real world seconds for one second measured by the program. Again, depending on your locale, either "x2.0" or "x2,0" may be required regarding the delimiter.
+When using relative time offsets or start-at timestamps (see ADVANCED TIMESTAMP FORMAT above and option \fB\-f\fR), the clock speed can be adjusted, i.e. time may run faster or slower for the executed program. For example, \fB"+5y x10"\fR will set the faked time 5 years into the future and make the time pass 10 times as fast (one real second equals 10 seconds measured by the program). Similarly, the flow of time can be slowed, e.g. using \fB"-7d x0,2"\fR, which will set the faked time 7 days in the past and set the clock speed to 20 percent, i.e. it takes five real world seconds for one second measured by the program. Again, depending on your locale, either "x2.0" or "x2,0" may be required regarding the delimiter. You can also make faketime to advance the reported time by a preset interval upon each time() call independently from the system's time using \fB"-7d i2,0"\fR, where 
+\fB"i"\fR is followed by the increase interval in seconds.
 .PP
 Faking times for multiple programs or even system-wide can be simplified by using ~/.faketimerc files and /etc/faketimerc. Please refer to the README that came with faketime for warnings and details.
 .SH AUTHOR
-Maintained by Wolfgang Hommel <wolf@code-wizards.com>. Please see the README and Changelog files for contributers. 
+Please see the README and NEWS files for contributers.
 .SH BUGS
-Due to limitations of the LD_PRELOAD mechanism, faketime will not work with suidroot and statically linked programs. 
+Due to limitations of the LD_PRELOAD mechanism, faketime will not work with suidroot and statically linked programs.
 While timestamps and time offsets will work for child processes, speeding the clock up or slowing it down might not
 work for child processes spawned by the executed program as expected; a new instance of libfaketime is used for each
-child process, which means that the libfaketime start time, which is used in speed adjustments, will also be 
-re-initialized.
+child process, which means that the libfaketime start time, which is used in speed adjustments, will also be
+re-initialized. Some programs may dynamically load system libraries, such as librt, at run-time and therefore bypass libfaketime. You may report programs that do not work with libfaketime, but only if they are available as open source.
 .SH "REPORTING BUGS"
-Please send an e-mail to Wolfgang Hommel <wolf@code-wizards.com>
+Please use https://github.com/wolfcw/libfaketime/issues
 .SH COPYRIGHT
-Copyright \(co 2003-2008 by Wolfgang Hommel.
+Copyright \(co 2003-2013 by the libfaketime authors.
 .PP
 There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE. You may redistribute copies of faketime under the

src/Makefile

@@ -4,11 +4,11 @@
 #   * Compilation Defines:
 #
 #     FAKE_STAT
-#         - Enables time faking also for files' timestamps. 
+#         - Enables time faking also for files' timestamps.
 #
 #     NO_ATFILE
 #         - Disables support for the fstatat() group of functions
-#     
+#
 #     PTHREAD
 #         - Define this to enable multithreading support.
 #
@@ -19,24 +19,28 @@
 #           try it unsynchronized.
 #
 #     FAKE_INTERNAL_CALLS
-#         - Also intercept libc internal __functions, e.g. not just time(), 
+#         - Also intercept libc internal __functions, e.g. not just time(),
 #           but also __time(). Enhances compatibility with applications
 #           that make use of low-level system calls, such as Java Virtual
-#           Machines.       
+#           Machines.
+#
+# 	  FAKE_SLEEP
+# 	      - Also intercept sleep(), nanosleep(), usleep(), alarm(), [p]poll()
+#
+#	  FAKE_TIMERS
+#	      - Also intercept timer_settime() and timer_gettime()
 #
 #     NO_CACHING
 #         - Disables the caching of the fake time offset. Only disable caching
-#           if you change the fake time offset during program runtime very 
+#           if you change the fake time offset during program runtime very
 #           frequently. Disabling the cache may negatively influence the
-#           performance. 
+#           performance.
 #
-#     LIMITEDFAKING
-#		  - Support environment variables that limit time faking to certain
-#		    time intervals or number of function calls.
-#
-#     SPAWNSUPPORT
-#         - Enable support for spawning an external process at a given
-#           timestamp.
+#	  MULTI_ARCH
+#	  	  - If MULTI_ARCH is set, the faketime wrapper program will put a literal
+#	  	    $LIB into the LD_PRELOAD environment variable it creates, which makes
+#	  	    ld automatically choose the correct library version to use for the
+#	  	    target binary. Use for Linux platforms with Multi-Arch support only!
 #
 #   * Compilation addition: second libMT target added for building the pthread-
 #     enabled library as a separate library
@@ -46,47 +50,64 @@
 #     which is used to activate the start-at times when specified. This also initializes
 #     the dynamic disabling of the FAKE_STAT calls.
 #
+# By default, libfaketime will be compiled for your system's default architecture.
+# To build 32-bit libraries and binaries, add -m32 to CFLAGS and LDFLAGS.
+#
+# Change PREFIX to where you want libfaketime (libraries and wrapper binary) installed.
+# LIBDIRNAME is relative to PREFIX. The default is to install into $PREFIX/lib/faketime,
+# but you can set LIBDIRNAME to, e.g., /lib64 if you want to install it elsewhere.
+# LIBDIRNAME has been introduced to support MultiLib systems. Please do not change the 
+# default value on MultiArch systems. 
+#
+# For testing in the current directory without installation, try make PREFIX= LIBDIRNAME='.'
 
-CC = gcc
-INSTALL = install
+CC ?= gcc
+INSTALL ?= install
 
-PREFIX = /usr/local
+PREFIX ?= /usr/local
+LIBDIRNAME ?= /lib/faketime
 
-CFLAGS += -std=gnu99 -Wall -DFAKE_STAT -DFAKE_INTERNAL_CALLS -fPIC -DPOSIX_REALTIME -DLIMITEDFAKING -DSPAWNSUPPORT
-LDFLAGS += -shared -ldl -lm -lpthread
+CFLAGS += -std=gnu99 -Wall -Wextra -Werror -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"'
+LIB_LDFLAGS += -shared
+LDFLAGS += -Wl,--version-script=libfaketime.map -lrt
+LDADD += -ldl -lm -lpthread -lrt
 
-SRC = faketime.c
-OBJ = faketime.o faketimeMT.o
+SRC = libfaketime.c
+LIBS_OBJ = libfaketime.o libfaketimeMT.o
+BINS = faketime
 
 SONAME = 1
 LIBS = libfaketime.so.${SONAME} libfaketimeMT.so.${SONAME}
 
-all: ${LIBS}
+all: ${LIBS} ${BINS}
 
 faketimeMT.o: EXTRA_FLAGS := -DPTHREAD -DPTHREAD_SINGLETHREADED_TIME
 
-${OBJ}: faketime.c
+${LIBS_OBJ}: libfaketime.c
 	${CC} -o $@ -c ${CFLAGS} ${EXTRA_FLAGS} $<
 
-lib%.so.${SONAME}: %.o
-	${CC} -o $@ -Wl,-soname,$@ ${LDFLAGS} $<
+%.so.${SONAME}: %.o libfaketime.map
+	${CC} -o $@ -Wl,-soname,$@ ${LDFLAGS} ${LIB_LDFLAGS} $< ${LDADD}
 
-clean: 
-	@rm -f ${OBJ} ${LIBS}
+${BINS}: faketime.c
+	${CC} -o $@ ${CFLAGS} ${EXTRA_FLAGS} $< ${LDFLAGS} ${LDADD}
+
+clean:
+	@rm -f ${LIBS_OBJ} ${LIBS} ${BINS}
 
 distclean: clean
-	@echo 
+	@echo
 
-install: ${LIBS}
-	@echo 
-	@echo "Copying the faketime libraries to ${DESTDIR}${PREFIX}/lib/faketime and the faketime wrapper script to ${DESTDIR}${PREFIX}/bin ..."
-	$(INSTALL) -dm0755 "${DESTDIR}${PREFIX}/lib/faketime/"
-	$(INSTALL) -m0644 ${LIBS} "${DESTDIR}${PREFIX}/lib/faketime/"
+install: ${LIBS} ${BINS}
+	@echo
+	@echo "Copying the faketime libraries to ${DESTDIR}${PREFIX}${LIBDIRNAME} and the faketime wrapper script to ${DESTDIR}${PREFIX}/bin ..."
+	$(INSTALL) -dm0755 "${DESTDIR}${PREFIX}${LIBDIRNAME}/"
+	$(INSTALL) -m0644 ${LIBS} "${DESTDIR}${PREFIX}${LIBDIRNAME}/"
 	$(INSTALL) -Dm0755 faketime "${DESTDIR}${PREFIX}/bin/faketime"
 
 uninstall:
-	for f in ${LIBS}; do rm -f "${DESTDIR}${PREFIX}/lib/faketime/$$f"; done
-	rmdir "${DESTDIR}${PREFIX}/lib/faketime"
+	for f in ${LIBS}; do rm -f "${DESTDIR}${PREFIX}${LIBDIRNAME}/$$f"; done
+	rmdir "${DESTDIR}${PREFIX}${LIBDIRNAME}"
 	rm -f "${DESTDIR}${PREFIX}/bin/faketime"
 
 .PHONY: all clean distclean install uninstall

src/Makefile.OSX

@@ -4,11 +4,11 @@
 #   * Compilation Defines:
 #
 #     FAKE_STAT
-#         - Enables time faking also for files' timestamps. 
+#         - Enables time faking also for files' timestamps.
 #
 #     NO_ATFILE
 #         - Disables support for the fstatat() group of functions
-#     
+#
 #     PTHREAD
 #         - Define this to enable multithreading support.
 #
@@ -18,26 +18,14 @@
 #           without this, but the performance impact may require you to
 #           try it unsynchronized.
 #
-#     FAKE_INTERNAL_CALLS
-#         - Also intercept libc internal __functions, e.g. not just time(), 
-#           but also __time(). Enhances compatibility with applications
-#           that make use of low-level system calls, such as Java Virtual
-#           Machines.       
+# 	  FAKE_SLEEP
+# 	      - Also intercept sleep(), nanosleep(), usleep(), alarm(), [p]poll()
 #
 #     NO_CACHING
 #         - Disables the caching of the fake time offset. Only disable caching
-#           if you change the fake time offset during program runtime very 
+#           if you change the fake time offset during program runtime very
 #           frequently. Disabling the cache may negatively influence the
-#           performance. 
-#
-#     LIMITEDFAKING
-#         - Support environment variables that limit time faking to certain
-#           time intervals or number of function calls.
-#
-#     SPAWNSUPPORT
-#         - Enable support for spawning an external process at a given
-#           timestamp.
-#
+#           performance.
 #
 #   * Compilation addition: second libMT target added for building the pthread-
 #     enabled library as a separate library
@@ -47,41 +35,43 @@
 #     which is used to activate the start-at times when specified. This also initializes
 #     the dynamic disabling of the FAKE_STAT calls.
 #
+# By default, libfaketime will be compiled for your system's default architecture.
+# To build for a different architecture, add -arch flags to CFLAGS and LDFLAGS.
+#
+# default to clang to support thread local variables
+CC ?= clang
+INSTALL ?= install
 
-CC = gcc
-INSTALL = install
+PREFIX ?= /usr/local
 
-PREFIX = /usr/local
-
-# If you get an error about an unsupported architecture, remove it. Some
-# versions of XCode support different subsets of architectures, depending on
-# age.
-# 10.5
-#CFLAGS = -dynamiclib -DFAKE_INTERNAL_CALLS -arch i386 -arch ppc
-# 10.6
-CFLAGS = -dynamiclib -DFAKE_INTERNAL_CALLS -arch i386 -arch x86_64 -DLIMITEDFAKING -DSPAWNSUPPORT
-SRC = faketime.c
+CFLAGS += -DFAKE_SLEEP -DPREFIX='"'${PREFIX}'"'
+LIB_LDFLAGS += -dynamiclib -current_version 0.9.5 -compatibility_version 0.7
 
 SONAME = 1
-LIBS = libfaketime.dylib.${SONAME}
+LIBS = libfaketime.${SONAME}.dylib
+BINS = faketime
 
-all: ${LIBS}
+all: ${LIBS} ${BINS}
 
-libfaketime.dylib.${SONAME}: ${SRC}
-	${CC} -o $@ ${CFLAGS} $<
+libfaketime.${SONAME}.dylib: libfaketime.c
+	${CC} -o $@ ${CFLAGS} ${LDFLAGS} ${LIB_LDFLAGS} -install_name ${PREFIX}/lib/faketime/$@ $<
 
-clean: 
-	@rm -f ${OBJ} ${LIBS}
+faketime: faketime.c
+	${CC} -o $@ ${CFLAGS} ${LDFLAGS} $<
+
+clean:
+	@rm -f ${OBJ} ${LIBS} ${BINS}
 
 distclean: clean
-	@echo 
+	@echo
 
-install: ${LIBS}
-	@echo 
+install: ${LIBS} ${BINS}
+	@echo
 	@echo "Copying the faketime libraries to ${DESTDIR}${PREFIX}/lib/faketime and the faketime wrapper script to ${DESTDIR}${PREFIX}/bin ..."
 	$(INSTALL) -dm0755 "${DESTDIR}${PREFIX}/lib/faketime/"
 	$(INSTALL) -m0644 ${LIBS} "${DESTDIR}${PREFIX}/lib/faketime/"
-	$(INSTALL) -Dm0755 faketime "${DESTDIR}${PREFIX}/bin/faketime"
+	$(INSTALL) -dm0755 "${DESTDIR}${PREFIX}/bin"
+	$(INSTALL) -m0755 faketime "${DESTDIR}${PREFIX}/bin/faketime"
 
 uninstall:
 	for f in ${LIBS}; do rm -f "${DESTDIR}${PREFIX}/lib/faketime/$$f"; done

src/faketime

@@ -1,114 +0,0 @@
-#!/bin/sh
-
-# Simple wrapper shell script for FTPL (faketime preload library)
-# Thanks to Daniel Kahn Gillmor for improvement suggestions. 
-
-# It allows you to modify the date and time a program sees when using
-# system library calls such as time() and fstat(). 
-
-# This wrapper exposes only a small subset of the FTPL functionality.
-# Please see FTPL's README file for more details
-
-# Acknowledgment: Parts of the functionality of this wrapper have been 
-# inspired by Matthias Urlichs' datefudge 1.14.
-
-# Configuration: Path where the libfaketime libraries can be found on Linux/UNIX.
-FTPL_PATH=/usr/lib/faketime
-
-# For Mac OS X users: Full path and name to libfaketime.dylib.1 
-MAC_FTPL_PATH=./libfaketime.dylib.1
-
-offset="$1"
-
-DATE_CMD=date
-
-USEMT=0
-USEDIRECT=0
-
-if [ "$offset" = "-v" -o "$offset" = "--version" ] ; then
-	echo ""
-	echo "$0: Version 0.8"
-	echo "For usage information please use '$0 --help'."
-	echo ""
-	exit 0
-fi
-
-if [ "$offset" = "-m" ] ; then USEMT=1; shift; offset="$1"; fi
-if [ "$offset" = "-f" ] ; then USEDIRECT=1; shift; offset="$1"; fi
-if [ "$offset" = "-m" ] ; then USEMT=1; shift; offset="$1"; fi
-
-if [ -z "$offset" -o "$offset" = "-h" -o "$offset" = "-?" -o "$offset" = "--help" ] ; then
-	echo ""
-	echo "Usage: $0 [switches] timestamp program arguments"
-	echo ""
-	echo "This will run the specified 'program' with the given 'arguments'."
-	echo "The program will be tricked into seeing the given 'timestamp' as its starting date and time."
-	echo "The clock will continue to run from this timestamp. Please see the manpage (man faketime)"
-	echo "for advanced options, such as stopping the wall clock and make it run faster or slower."
-	echo ""
-	echo "The optional switches are:"
-	echo "  -m        : Use the multi-threaded version of libfaketime"
-	echo "  -f        : Use the advanced timestamp specification format (see manpage)"
-	echo ""
-	echo "Examples:"
-	echo "$0 'last friday 5 pm' /bin/date"
-	echo "$0 '2008-12-24 08:15:42' /bin/date"
-	echo "$0 -f '+2,5y x10,0' /bin/bash -c 'date; while true; do echo \$SECONDS ; sleep 1 ; done'"
-	echo "$0 -f '+2,5y x0,50' /bin/bash -c 'date; while true; do echo \$SECONDS ; sleep 1 ; done'"
-	echo "(Please note that it depends on your locale settings whether . or , has to be used for fractions)"
-	echo ""
-	if [ -z "$offset" ] ; then
-		exit 1;
-	fi
-	exit 0
-fi
-
-shift
-
-# Check whether we are on Mac OS X (Darwin)
-UNAME=$(uname)
-if [ "$UNAME" = "Darwin" ] ; then
-    export DYLD_FORCE_FLAT_NAMESPACE=1
-    export DYLD_INSERT_LIBRARIES=$MAC_FTPL_PATH
-    DATE_CMD=gdate
-fi
-
-# Setting LD_PRELOAD ...
-if [ "$USEMT" -eq 0 ] ; then
-	export LD_PRELOAD="${LD_PRELOAD}${LD_PRELOAD:+:}$FTPL_PATH/libfaketime.so.1"
-fi
-if [ "$USEMT" -eq 1 ] ; then
-	export LD_PRELOAD="${LD_PRELOAD}${LD_PRELOAD:+:}$FTPL_PATH/libfaketimeMT.so.1"
-fi
-
-###
-
-# Setting FAKETIME ...
-
-if [ "$USEDIRECT" -eq 0 ] ; then
-	seconds=$($DATE_CMD -d "$offset" '+%s')
-	if [ $? -ne 0 ] ; then 
-		echo "Error: Timestamp to fake not recognized, please re-try with a different timestamp."
-		exit 1 
-	fi
-
-	offset=$(expr $seconds - $($DATE_CMD '+%s'))
-	if [ $? -ne 0 ] ; then 
-		echo "Error: Cannot calculate the faketime offset in seconds, please re-try with a different timestamp."
-		exit 1
-	fi
-
-	FAKETIMEPREFIX=""
-	if [ "$offset" -ge 0 ] ; then
-		FAKETIMEPREFIX="+"
-	fi
-
-	export FAKETIME="$FAKETIMEPREFIX$offset"
-fi
-if [ "$USEDIRECT" -eq 1 ] ; then
-	export FAKETIME="$offset"
-fi
-###
-
-# Executing the user-specified command ...
-exec "$@"

src/faketime_common.h

@@ -0,0 +1,50 @@
+/*
+ * Faketime's common definitions
+ *
+ * Copyright 2013 Balint Reczey <balint@balintreczey.hu>
+ *
+ * This file is part of the libfaketime.
+ *
+ * libfaketime is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License v2 as published by the Free
+ * Software Foundation.
+ *
+ * libfaketime is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License v2 along
+ * with libfaketime; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef FAKETIME_COMMON_H
+#define FAKETIME_COMMON_H
+
+#include <stdint.h>
+
+struct system_time_s
+{
+  /* System time according to CLOCK_REALTIME */
+  struct timespec real;
+  /* System time according to CLOCK_MONOTONIC */
+  struct timespec mon;
+  /* System time according to CLOCK_MONOTONIC_RAW */
+  struct timespec mon_raw;
+};
+
+/* Data shared among faketime-spawned processes */
+struct ft_shared_s
+{
+  /*
+   * When advancing time linearly with each time(), etc. call, the calls are
+   * counted here */
+  uint64_t ticks;
+  /* Index of timstamp to be loaded from file */
+  uint64_t file_idx;
+  /* System time Faketime started at */
+  struct system_time_s start_time;
+};
+
+#endif

src/libfaketime.map

@@ -0,0 +1,10 @@
+GLIBC_2.2 {
+  global:
+
+  timer_gettime; timer_settime;
+  local: timer_settime_*; timer_gettime_*;
+};
+GLIBC_2.3.3 {
+  # Changed timer_t.
+  timer_gettime; timer_settime;
+} GLIBC_2.2;

src/time_ops.h

@@ -0,0 +1,99 @@
+/*
+ * Time operation macros based on sys/time.h
+ * Copyright 2013 Balint Reczey <balint@balintreczey.hu>
+ *
+ * This file is part of libfaketime.
+ *
+ * libfaketime is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License v2 as published by the Free
+ * Software Foundation.
+ *
+ * libfaketime is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License v2 along
+ * with libfaketime; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef TIME_OPS_H
+#define TIME_OPS_H
+#include <time.h>
+
+#define SEC_TO_uSEC 1000000
+#define SEC_TO_nSEC 1000000000
+
+/* Convenience macros for operations on timevals.
+   NOTE: `timercmp' does not work for >= or <=.  */
+#define timerisset2(tvp, prefix) ((tvp)->tv_sec || (tvp)->tv_##prefix##sec)
+#define timerclear2(tvp, prefix) ((tvp)->tv_sec = (tvp)->tv_##prefix##sec = 0)
+#define timercmp2(a, b, CMP, prefix)			                    \
+  (((a)->tv_sec == (b)->tv_sec) ?		                    	    \
+   ((a)->tv_##prefix##sec CMP (b)->tv_##prefix##sec) :      	    \
+   ((a)->tv_sec CMP (b)->tv_sec))
+#define timeradd2(a, b, result, prefix)			            	    \
+  do {							                            	    \
+    (result)->tv_sec = (a)->tv_sec + (b)->tv_sec;	        	    \
+    (result)->tv_##prefix##sec = (a)->tv_##prefix##sec +    	    \
+      (b)->tv_##prefix##sec;				                	    \
+    if ((result)->tv_##prefix##sec >= SEC_TO_##prefix##SEC) 	    \
+      {							                            	    \
+        ++(result)->tv_sec;				                    	    \
+        (result)->tv_##prefix##sec -= SEC_TO_##prefix##SEC; 	    \
+      }								                                \
+  } while (0)
+#define timersub2(a, b, result, prefix)			            	    \
+  do {							                            	    \
+    (result)->tv_sec = (a)->tv_sec - (b)->tv_sec;	        	    \
+    (result)->tv_##prefix##sec = (a)->tv_##prefix##sec -    	    \
+      (b)->tv_##prefix##sec;				                	    \
+    if ((result)->tv_##prefix##sec < 0) {		            	    \
+      --(result)->tv_sec;				                           	\
+      (result)->tv_##prefix##sec += SEC_TO_##prefix##SEC;	        \
+    }								                                \
+  } while (0)
+#define timermul2(tvp, c, result, prefix)				            \
+  do {									                            \
+    long long tmp_time;							                    \
+    tmp_time = (c) * ((tvp)->tv_sec * SEC_TO_##prefix##SEC +		\
+		      (tvp)->tv_##prefix##sec);				                \
+    (result)->tv_##prefix##sec = tmp_time % SEC_TO_##prefix##SEC;	\
+    (result)->tv_sec = (tmp_time - (result)->tv_##prefix##sec) /	\
+      SEC_TO_##prefix##SEC;						                    \
+    if ((result)->tv_##prefix##sec < 0)	{				            \
+      (result)->tv_##prefix##sec +=  SEC_TO_##prefix##SEC;	    	\
+      (result)->tv_sec -= 1;						                \
+    }									                            \
+  } while (0)
+
+/* ops for microsecs */
+#ifndef timerisset
+#define timerisset(tvp) timerisset2(tvp,u)
+#endif
+#ifndef timerclear
+#define timerclear(tvp) timerclear2(tvp, u)
+#endif
+#ifndef timercmp
+#define timercmp(a, b, CMP) timercmp2(a, b, CMP, u)
+#endif
+#ifndef timeradd
+#define timeradd(a, b, result) timeradd2(a, b, result, u)
+#endif
+#ifndef timersub
+#define timersub(a, b, result) timersub2(a, b, result, u)
+#endif
+#ifndef timersub
+#define timermul(a, c, result) timermul2(a, c, result, u)
+#endif
+
+/* ops for nanosecs */
+#define timespecisset(tvp) timerisset2(tvp,n)
+#define timespecclear(tvp) timerclear2(tvp, n)
+#define timespeccmp(a, b, CMP) timercmp2(a, b, CMP, n)
+#define timespecadd(a, b, result) timeradd2(a, b, result, n)
+#define timespecsub(a, b, result) timersub2(a, b, result, n)
+#define timespecmul(a, c, result) timermul2(a, c, result, n)
+
+#endif

src/timeprivacy

@@ -0,0 +1,270 @@
+#!/bin/bash
+
+## Copyright (c) 2013, adrelanos at riseup dot net
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted provided that the following conditions are met: 
+##
+## 1. Redistributions of source code must retain the above copyright notice, this
+## list of conditions and the following disclaimer. 
+## 2. Redistributions in binary form must reproduce the above copyright notice,
+## this list of conditions and the following disclaimer in the documentation
+## and/or other materials provided with the distribution. 
+##
+## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+## ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+## WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+## DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+## ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+## (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+## LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+## SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#set -x
+
+SCRIPTNAME="$(basename $0)"
+
+usage() {
+   echo "$SCRIPTNAME
+
+Usage: $SCRIPTNAME [-h help] [-d day] [-m month] [-y year] [-i increment in seconds (0-60)] [-r random increment in seconds (0-60)] [-f history folder]
+Example: $SCRIPTNAME -d 30 -m 12 -y 2013 -i 10 -f /tmp/$SCRIPTNAMEtest
+         sudo $SCRIPTNAME -d 30 -m 12 -y 2013 -r -f /tmp/$SCRIPTNAMEtest"
+}
+
+_randomincrement="none"
+_increment="none"
+
+while [ -n "$1" ]; do
+  case "$1" in
+      -h)
+          usage
+          exit 0
+          ;;
+      -d)
+          _day="$2"
+          shift
+          ;;
+      -m)
+          _month="$2"
+          shift
+          ;;
+      -y)
+          _year="$2"
+          shift
+          ;;
+      -i)
+          _increment="$2"
+          shift
+          ;;
+      -r)
+          _randomincrement="$2"
+          shift
+          ;;
+      -f)
+          TIMEDIR="$2"
+          shift
+          ;;
+      *)
+          command="$(which $1)"
+          ## From now on the complete to-be wrapped command + its args
+          ## are stored in $@, which will expand like we want it for
+          ## handling quoted arguments with whitespaces in it, etc.
+          break
+  esac
+  shift
+done
+
+if [ -z "$_day" ]; then
+   _day="$(date +"%d")"
+fi
+
+if [ -z "$_month" ]; then
+   _month="$(date +"%m")"
+fi
+
+if [ -z "$_year" ]; then
+   _year="$(date +"%Y")"
+fi
+
+if [ "$_randomincrement" = "none" ] && [ "$_increment" = "none" ]; then
+   _increment="1"
+fi
+
+if [ "$_randomincrement" = "none" ]; then
+   if [ -z "$_increment" ]; then
+      _increment="1"
+   fi
+elif [ "$_increment" = "none" ]; then
+   if [ "$_randomincrement" = "" ]; then
+      echo "randomincrement must be a positive number."
+      exit 1
+   else
+      ## random number between 1 and $_randomincrement
+      random_number="$(( 0+($(od -An -N2 -i /dev/random) )%($_randomincrement-0+1) ))"
+      _increment="$random_number"
+   fi
+else
+   echo "You can not combine -r and -i."
+   exit 1
+fi
+
+if [ -z "$TIMEDIR" ]; then
+   TIMEDIR=~/.timeprivacy
+fi
+
+nodigits="$(echo $_increment | sed 's/[[:digit:]]//g')"
+if [ ! -z "$nodigits" ]; then
+   echo "increment is not a digit."
+   exit 1
+fi
+
+nodigits="$(echo $_year | sed 's/[[:digit:]]//g')"
+if [ ! -z "$nodigits" ]; then
+   echo "_day is not a digit."
+   exit 1
+fi
+
+nodigits="$(echo $_year | sed 's/[[:digit:]]//g')"
+if [ ! -z "$nodigits" ]; then
+   echo "year is not a digit."
+   exit 1
+fi
+
+nodigits="$(echo $_month | sed 's/[[:digit:]]//g')"
+if [ ! -z "$nodigits" ]; then
+   echo "month is not a digit."
+   exit 1
+fi
+
+nodigits="$(echo $_day | sed 's/[[:digit:]]//g')"
+if [ ! -z "$nodigits" ]; then
+   echo "day is not a digit."
+   exit 1
+fi
+
+nodigits="$(echo $_increment | sed 's/[[:digit:]]//g')"
+if [ ! -z "$nodigits" ]; then
+   echo "increment is not a digit."
+   exit 1
+fi
+
+SECONDS_FILE="$TIMEDIR/seconds_file"
+MINUTES_FILE="$TIMEDIR/minutes_file"
+HOURS_FILE="$TIMEDIR/hours_file"
+
+#DAYS_FILE="$TIMEDIR/days_file"
+#MONTHS_FILE="$TIMEDIR/months_file"
+#YEARS_FILE="$TIMEDIR/years_file"
+
+#true "TIMEDIR: $TIMEDIR"
+#true "year: $_year"
+#true "month: $_month"
+#true "day: $_day"
+#true "_randomincrement: $_randomincrement"
+#true "_increment: $_increment"
+
+read_date_file() {
+   if [ ! -d "$TIMEDIR" ]; then
+      mkdir -p "$TIMEDIR"
+   fi
+
+   if [ ! -f "$SECONDS_FILE" ]; then
+      echo "0" > "$SECONDS_FILE"
+   fi
+
+   if [ ! -f "$MINUTES_FILE" ]; then
+      echo "0" > "$MINUTES_FILE"
+   fi
+
+   if [ ! -f "$HOURS_FILE" ]; then
+      echo "0" > "$HOURS_FILE"
+   fi
+
+   #if [ ! -f "$DAYS_FILE" ]; then
+      #echo "1" > "$DAYS_FILE"
+   #fi
+
+   #if [ ! -f "$MONTHS_FILE" ]; then
+      #echo "1" > "$MONTHS_FILE"
+   #fi
+
+   #if [ ! -f "$YEARS_FILE" ]; then
+      #echo "2013" > "$YEARS_FILE"
+   #fi
+
+   SECONDS="$(cat "$SECONDS_FILE")"
+   MINUTES="$(cat "$MINUTES_FILE")"
+   HOURS="$(cat "$HOURS_FILE")"
+
+   if [ -z "$SECONDS" ]; then
+      SECONDS="0"
+   fi
+
+   if [ -z "$MINUTES" ]; then
+      MINUTES="0"
+   fi
+
+   if [ -z "$HOURS" ]; then
+      HOURS="0"
+   fi
+
+   local nodigits="$(echo $SECONDS | sed 's/[[:digit:]]//g')"
+   if [ ! -z "$nodigits" ]; then
+      SECONDS="0"
+   fi
+
+   local nodigits="$(echo $MINUTES | sed 's/[[:digit:]]//g')"
+   if [ ! -z "$nodigits" ]; then
+      MINUTES="0"
+   fi
+
+   local nodigits="$(echo $HOURS | sed 's/[[:digit:]]//g')"
+   if [ ! -z "$nodigits" ]; then
+      HOURS="0"
+   fi
+
+   SECONDS="$(expr "$SECONDS" + "$_increment")" || true
+   if [ "$SECONDS" -ge "60" ]; then
+      SECONDS="0"
+
+      MINUTES="$(expr "$MINUTES" + "1")" || true
+      if [ "$MINUTES" -ge "60" ]; then
+         MINUTES="0"
+
+         HOURS="$(expr "$HOURS" + "1")" || true
+         if [ "$HOURS" -ge "24" ]; then
+            HOURS="0"
+         fi
+         echo "$HOURS" > "$HOURS_FILE"
+
+      fi
+      echo "$MINUTES" > "$MINUTES_FILE"
+
+   fi
+
+   echo "$SECONDS" > "$SECONDS_FILE"
+
+   #echo "$HOURS $MINUTES $SECONDS"
+}
+
+need_new_date() {
+   ## Testing
+   #while [ 1 ]; do
+   #   read_date_file
+   #done
+
+   read_date_file
+
+   ## Testing
+   #echo "faketime '$_year-$_month-$_day $HOURS:$MINUTES:$SECONDS' /bin/date"
+   #faketime "$_year-$_month-$_day $HOURS:$MINUTES:$SECONDS" /bin/date
+
+   echo "$_year-$_month-$_day $HOURS:$MINUTES:$SECONDS"
+}
+
+need_new_date
+

test/Makefile

@@ -1,6 +1,6 @@
 CC = gcc
 
-CFLAGS = -std=gnu99 -Wall -DFAKE_STAT
+CFLAGS = -std=gnu99 -Wall -DFAKE_STAT -Werror -Wextra
 LDFLAGS = -lrt
 
 SRC = timetest.c
@@ -22,10 +22,10 @@ test: timetest functest
 functest:
 	./testframe.sh functests
 
-clean: 
+clean:
 	@rm -f ${OBJ} timetest
 
 distclean: clean
-	@echo 
+	@echo
 
 .PHONY: all test clean distclean

test/Makefile.OSX

@@ -1,7 +1,7 @@
 CC = gcc
 
 CFLAGS = -std=gnu99 -Wall -DFAKE_STAT
-LDFLAGS = 
+LDFLAGS =
 
 SRC = timetest.c
 OBJ = ${SRC:.c=.o}
@@ -16,16 +16,16 @@ timetest: ${OBJ}
 
 test: timetest functest
 	@echo
-	@./test.sh
+	@./test_OSX.sh
 
 # run functional tests
 functest:
 	./testframe.sh functests
 
-clean: 
+clean:
 	@rm -f ${OBJ} timetest
 
 distclean: clean
-	@echo 
+	@echo
 
 .PHONY: all test clean distclean

test/README-testframe.txt

@@ -24,7 +24,7 @@
 # testsuite script can make use of any functions defined
 # in these inc files.  the environment variable
 # TESTSUITE_NAME is set to the filename of the testsuite
-# script, for possible use in warning or info messages.  
+# script, for possible use in warning or info messages.
 #
 # see functests/test_true.sh for a simple example of
 # a test suite script.

test/functests/common.inc

@@ -8,6 +8,7 @@ platform()
 	case "$out" in
 	*Darwin*) echo "mac" ;;
 	*Linux*) echo "linuxlike" ;;
+    GNU|GNU/kFreeBSD) echo "linuxlike" ;;
 	*) echo 1>&2 unsupported platform, uname=\"$out\" ;;
 	esac
 }
@@ -17,7 +18,7 @@ platform()
 mac_fakecmd()
 {
 	typeset timestring="$1"; shift
-	typeset fakelib=../src/libfaketime.dylib.1
+	typeset fakelib=../src/libfaketime.1.dylib
 	export DYLD_INSERT_LIBRARIES=$fakelib
 	export DYLD_FORCE_FLAT_NAMESPACE=1
 	FAKETIME="$timestring" \

test/functests/dont_test_false.sh

@@ -4,4 +4,3 @@ run()
 {
 	run_testcase false
 }
-

test/functests/test_true.sh

@@ -5,4 +5,3 @@ run()
 	run_testcase true
 	return 0
 }
-

test/test.sh

@@ -12,29 +12,55 @@ else
 	echo
 fi
 
+echo "============================================================================="
+echo
+
 echo "Running the test program with absolute date 2003-01-01 10:00:05 specified"
 echo "\$ LD_PRELOAD=../src/libfaketime.so.1 FAKETIME=\"2003-01-01 10:00:05\" ./timetest"
 LD_PRELOAD=../src/libfaketime.so.1 FAKETIME="2003-01-01 10:00:05" ./timetest
 echo
 
+echo "============================================================================="
+echo
+
 echo "Running the test program with START date @2005-03-29 14:14:14 specified"
 echo "\$ LD_PRELOAD=../src/libfaketime.so.1 FAKETIME=\"@2005-03-29 14:14:14\" ./timetest"
 LD_PRELOAD=../src/libfaketime.so.1 FAKETIME="@2005-03-29 14:14:14" ./timetest
 echo
 
+echo "============================================================================="
+echo
+
 echo "Running the test program with 10 days negative offset specified"
 echo "LD_PRELOAD=../src/libfaketime.so.1 FAKETIME=\"-10d\" ./timetest"
 LD_PRELOAD=../src/libfaketime.so.1 FAKETIME="-10d" ./timetest
 echo
 
+echo "============================================================================="
+echo
+
 echo "Running the test program with 10 days negative offset specified, and FAKE_STAT disabled"
 echo "\$ LD_PRELOAD=../src/libfaketime.so.1 FAKETIME=\"-10d\" NO_FAKE_STAT=1 ./timetest"
 LD_PRELOAD=../src/libfaketime.so.1 FAKETIME="-10d" NO_FAKE_STAT=1 ./timetest
 echo
 
+echo "============================================================================="
+echo
+
+echo "Running the test program with 10 days postive offset specified, and sped up 2 times"
+echo "\$ LD_PRELOAD=../src/libfaketime.so.1 FAKETIME=\"+10d x2\" ./timetest"
+LD_PRELOAD=../src/libfaketime.so.1 FAKETIME="+10d x2" NO_FAKE_STAT=1 ./timetest
+echo
+
+echo "============================================================================="
+echo
+
 echo "Running the 'date' command with 15 days negative offset specified"
 echo "\$ LD_PRELOAD=../src/libfaketime.so.1 FAKETIME=\"-15d\" date"
 LD_PRELOAD=../src/libfaketime.so.1 FAKETIME="-15d" date
 echo
 
+echo "============================================================================="
+echo "Testing finished."
+
 exit 0

test/test_OSX.sh

@@ -0,0 +1,46 @@
+#!/bin/sh
+
+export DYLD_FORCE_FLAT_NAMESPACE=1
+export DYLD_INSERT_LIBRARIES=../src/libfaketime.1.dylib
+
+if [ -f /etc/faketimerc ] ; then
+	echo "Running the test program with your system-wide default in /etc/faketimerc"
+	./timetest
+	echo
+else
+	echo "Running the test program with no faked time specified"
+	./timetest
+	echo
+fi
+
+echo "Running the test program with absolute date 2003-01-01 10:00:05 specified"
+echo "FAKETIME=\"2003-01-01 10:00:05\" ./timetest"
+FAKETIME="2003-01-01 10:00:05" ./timetest
+echo
+
+echo "Running the test program with START date @2005-03-29 14:14:14 specified"
+echo "FAKETIME=\"@2005-03-29 14:14:14\" ./timetest"
+FAKETIME="@2005-03-29 14:14:14" ./timetest
+echo
+
+echo "Running the test program with 10 days negative offset specified"
+echo "FAKETIME=\"-10d\" ./timetest"
+FAKETIME="-10d" ./timetest
+echo
+
+echo "Running the test program with 10 days negative offset specified, and FAKE_STAT disabled"
+echo "FAKETIME=\"-10d\" NO_FAKE_STAT=1 ./timetest"
+FAKETIME="-10d" NO_FAKE_STAT=1 ./timetest
+echo
+
+echo "Running the test program with 10 days postive offset specified, and sped up 2 times"
+echo "FAKETIME=\"+10d x2\" ./timetest"
+FAKETIME="+10d x2" NO_FAKE_STAT=1 ./timetest
+echo
+
+echo "Running the 'date' command with 15 days negative offset specified"
+echo "FAKETIME=\"-15d\" date"
+FAKETIME="-15d" date
+echo
+
+exit 0

test/timetest.c

@@ -3,13 +3,13 @@
  *
  *  This file is part of the FakeTime Preload Library.
  *
- *  The FakeTime Preload Library 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 
+ *  The FakeTime Preload Library 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 (at your option) any later version.
  *
- *  The FakeTime Preload Library is distributed in the hope that it will 
- *  be useful, but WITHOUT ANY WARRANTY; without even the implied warranty 
+ *  The FakeTime Preload Library is distributed in the hope that it will
+ *  be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
  *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
@@ -30,6 +30,25 @@
 #include <unistd.h>
 #endif
 
+#ifndef __APPLE__
+#include <signal.h>
+
+#define VERBOSE 0
+
+static void
+handler(int sig, siginfo_t *si, void *uc)
+{
+  /* Note: calling printf() from a signal handler is not
+     strictly correct, since printf() is not async-signal-safe;
+     see signal(7) */
+
+  if ((si == NULL) || (si != uc))
+  {
+    printf("Caught signal %d\n", sig);
+  }
+  signal(sig, SIG_IGN);
+}
+#endif
 
 int main (int argc, char **argv) {
 
@@ -38,11 +57,78 @@ int main (int argc, char **argv) {
     struct timeval tv;
 #ifndef __APPLE__
     struct timespec ts;
+    timer_t timerid1 = 0, timerid2;
+    struct sigevent sev;
+    struct itimerspec its;
+    sigset_t mask;
+    struct sigaction sa;
 #endif
 #ifdef FAKE_STAT
     struct stat buf;
 #endif
 
+#ifndef __APPLE__
+    sa.sa_flags = SA_SIGINFO;
+    sa.sa_sigaction = handler;
+    sigemptyset(&sa.sa_mask);
+    if (sigaction(SIGRTMIN, &sa, NULL) == -1) {
+      perror("sigaction");
+      exit(EXIT_FAILURE);
+    }
+    /* Block timer signal temporarily */
+
+    printf("Blocking signal %d\n", SIGRTMIN);
+    sigemptyset(&mask);
+    sigaddset(&mask, SIGRTMIN);
+    if (sigprocmask(SIG_SETMASK, &mask, NULL) == -1) {
+      perror("sigaction");
+      exit(EXIT_FAILURE);
+      }
+
+    /* Create the timer */
+    sev.sigev_notify = SIGEV_SIGNAL;
+    sev.sigev_signo = SIGRTMIN;
+    sev.sigev_value.sival_ptr = &timerid1;
+    if (timer_create(CLOCK_REALTIME, &sev, &timerid1) == -1) {
+      perror("timer_create");
+      exit(EXIT_FAILURE);
+    }
+
+    /* Start timer1 */
+
+    /* start timer ticking after one second */
+    its.it_value.tv_sec = 1;
+    its.it_value.tv_nsec = 0;
+    /* fire in every 0.3 seconds */
+    its.it_interval.tv_sec = 0;
+    its.it_interval.tv_nsec = 300000000;
+
+    if (timer_settime(timerid1, 0, &its, NULL) == -1) {
+      perror("timer_settime");
+      exit(EXIT_FAILURE);
+    }
+
+    sev.sigev_value.sival_ptr = &timerid2;
+    if (timer_create(CLOCK_REALTIME, &sev, &timerid2) == -1) {
+      perror("timer_create");
+      exit(EXIT_FAILURE);
+    }
+
+    /* Start timer2 */
+
+    clock_gettime(CLOCK_REALTIME, &its.it_value);
+    /* start timer ticking after one second */
+    its.it_value.tv_sec += 3;
+    /* fire once */
+    its.it_interval.tv_sec = 0;
+    its.it_interval.tv_nsec = 0;
+
+    if (timer_settime(timerid2, TIMER_ABSTIME, &its, NULL) == -1) {
+      perror("timer_settime");
+      exit(EXIT_FAILURE);
+    }
+#endif
+
     time(&now);
     printf("time()         : Current date and time: %s", ctime(&now));
     printf("time(NULL)     : Seconds since Epoch  : %u\n", (unsigned int)time(NULL));
@@ -52,14 +138,47 @@ int main (int argc, char **argv) {
 
     printf("(Intentionally sleeping 2 seconds...)\n");
     fflush(stdout);
-    sleep(2);
+    if (argc < 3)
+    {
+        sleep(1);
+        usleep(1000000);
+    }
 
     gettimeofday(&tv, NULL);
     printf("gettimeofday() : Current date and time: %s", ctime(&tv.tv_sec));
 
 #ifndef __APPLE__
+    if (sigprocmask(SIG_UNBLOCK, &mask, NULL) == -1) {
+      perror("sigprocmask");
+      exit(EXIT_FAILURE);
+    }
+
     clock_gettime(CLOCK_REALTIME, &ts);
     printf("clock_gettime(): Current date and time: %s", ctime(&ts.tv_sec));
+
+    int timer_getoverrun_timerid1 = timer_getoverrun(timerid1);
+    if (timer_getoverrun_timerid1 != 3) {
+        printf("timer_getoverrun(timerid1) FAILED, must be 3 but got: %d\n", timer_getoverrun_timerid1);
+    }
+
+    timer_gettime(timerid1, &its);
+    if (VERBOSE == 1) {
+        printf("timer_gettime(timerid1, &its); its = {{%ld, %ld}, {%ld, %ld}}}\n",
+                its.it_interval.tv_sec, its.it_interval.tv_nsec,
+                its.it_value.tv_sec, its.it_value.tv_nsec);
+    }
+
+    int timer_getoverrun_timerid2 = timer_getoverrun(timerid2);
+    if (timer_getoverrun_timerid2 != 0) {
+        printf("timer_getoverrun(timerid2) FAILED, must be 0 but got: %d\n", timer_getoverrun_timerid2);
+    }
+
+    timer_gettime(timerid2, &its);
+    if (VERBOSE == 1) {
+        printf("timer_gettime(timerid2, &its); its = {{%ld, %ld}, {%ld, %ld}}}\n",
+            its.it_interval.tv_sec, its.it_interval.tv_nsec,
+            its.it_value.tv_sec, its.it_value.tv_nsec);
+    }
 #endif
 
 #ifdef FAKE_STAT