--- a/restore/main.c
+++ b/restore/main.c
@@ -86,6 +86,7 @@ int abortifconnerr = 1;		/* set to 1 if
 int	aflag = 0, bflag = 0, cvtflag = 0, dflag = 0, vflag = 0, yflag = 0;
 int	hflag = 1, mflag = 1, Mflag = 0, Nflag = 0, Vflag = 0, zflag = 0;
 int	uflag = 0, lflag = 0, Lflag = 0, oflag = 0;
+int	nullflag = 0;		/* \0 terminated file names */
 int	ufs2flag = 0;
 char	*Afile = NULL;
 int	dokerberos = 0;
@@ -192,7 +193,7 @@ main(int argc, char *argv[])
 #ifdef USE_QFA
 		"P:Q:"
 #endif
-		"Rrs:tT:uvVxX:y")) != -1)
+		"Rrs:tT:uvVxX:y0")) != -1)
 		switch(ch) {
 		case 'a':
 			aflag = 1;
@@ -337,6 +338,9 @@ main(int argc, char *argv[])
 		case 'y':
 			yflag = 1;
 			break;
+		case '0':
+			nullflag = 1;
+			break;
 		default:
 			usage();
 		}
@@ -729,7 +733,7 @@ usage(void)
 		"\t%s    [-f file] [-F script] [-s fileno] [-T directory]\n"
 		"\t%s -R [-cd" tseflag "H" kerbflag "lMuvVy] [-b blocksize] " tsEflag"\n"
 		"\t%s    [-f file] [-F script] [-s fileno] [-T directory]\n"
-		"\t%s -t [-cdhH" kerbflag "lMuvVy] [-A file] [-b blocksize]\n"
+		"\t%s -t [-cdhH" kerbflag "lMuvVy0] [-A file] [-b blocksize]\n"
 		"\t%s    [-f file] [-F script] " qfaflag "[-s fileno] [-X filelist] [file ...]\n"
 		"\t%s -x [-acd" tseflag "hH" kerbflag "lmMouvVy] [-A file] [-b blocksize] " tsEflag"\n"
 		"\t%s    [-f file] [-F script] " qfaflag "[-s fileno] [-X filelist] [file ...]\n",
--- a/restore/restore.8.in
+++ b/restore/restore.8.in
@@ -29,7 +29,7 @@
 .SH NAME
 restore \- restore files or file systems from backups made with dump
 .SH SYNOPSIS
-.B restore \-C 
+.B restore \-C
 [\fB\-cdHklMvVy\fR]
 [\fB\-b \fIblocksize\fR]
 [\fB\-D \fIfilesystem\fR]
@@ -49,7 +49,7 @@ restore \- restore files or file systems
 [\fB\-s \fIfileno\fR]
 [\fB\-T \fIdirectory\fR]
 .PP
-.B restore \-P 
+.B restore \-P
 .I file
 [\fB\-acdhHklmMNuvVy\fR]
 [\fB\-b \fIblocksize\fR]
@@ -68,7 +68,7 @@ restore \- restore files or file systems
 [\fB\-s \fIfileno\fR]
 [\fB\-T \fIdirectory\fR]
 .PP
-.B restore \-r 
+.B restore \-r
 [\fB\-cdHklMNuvVy\fR]
 [\fB\-b \fIblocksize\fR]
 [\fB\-f \fIfile\fR]
@@ -77,7 +77,7 @@ restore \- restore files or file systems
 [\fB\-T \fIdirectory\fR]
 .PP
 .B restore \-t
-[\fB\-cdhHklMNuvVy\fR]
+[\fB\-cdhHklMNuvV0y\fR]
 [\fB\-A \fIfile\fR]
 [\fB\-b \fIblocksize\fR]
 [\fB\-f \fIfile\fR]
@@ -88,7 +88,7 @@ restore \- restore files or file systems
 [\fB\-X \fIfilelist\fR]
 [ \fIfile ... \fR]
 .PP
-.B restore \-x 
+.B restore \-x
 [\fB\-adchHklmMNouvVy\fR]
 [\fB\-A \fIfile\fR]
 [\fB\-b \fIblocksize\fR]
@@ -105,7 +105,7 @@ The
 command performs the inverse function of
 .BR dump (8).
 A full backup of a file system may be restored and subsequent incremental
-backups layered on top of it. Single files and directory subtrees may be 
+backups layered on top of it. Single files and directory subtrees may be
 restored from full or partial backups.
 .B Restore
 works across a network; to do this see the
@@ -122,7 +122,7 @@ Exactly one of the following flags is re
 This mode allows comparison of files from a dump.
 .B Restore
 reads the backup and compares its contents with files present on the disk. It
-first changes its working directory to the root of the filesystem that was 
+first changes its working directory to the root of the filesystem that was
 dumped and compares the tape with the files in its new current directory. See
 also the
 .B \-L
@@ -132,8 +132,8 @@ flag described below.
 This mode allows interactive restoration of files from a dump. After reading in
 the directory information from the dump,
 .B restore
-provides a shell like interface that allows the user to move around the 
-directory tree selecting files to be extracted. The available commands are 
+provides a shell like interface that allows the user to move around the
+directory tree selecting files to be extracted. The available commands are
 given below; for those commands that require an argument, the default is the
 current directory.
 .RS
@@ -144,18 +144,18 @@ extracted.  If a directory is specified,
 added to the extraction list (unless the
 .B \-h
 flag is specified on the command line). Files that are on the extraction list
-are prepended with a \*(lq*\*(rq when they are listed by 
+are prepended with a \*(lq*\*(rq when they are listed by
 .BR ls .
 .TP
 .BI cd " arg"
 Change the current working directory to the specified argument.
 .TP
 .B delete \fR[\fIarg\fR]
-The current directory or specified argument is deleted from the list of files 
+The current directory or specified argument is deleted from the list of files
 to be extracted. If a directory is specified, then it and all its descendants
 are deleted from the extraction list (unless the
 .B \-h
-flag is specified on the command line). The most expedient way to extract most 
+flag is specified on the command line). The most expedient way to extract most
 of the files from a directory is to add the directory to the extraction list
 and then delete those files that are not needed.
 .TP
@@ -169,9 +169,9 @@ files is to start with the last volume a
 List a summary of the available commands.
 .TP
 .B ls \fR[\fIarg\fR]
-List the current or specified directory. Entries that are directories are 
-appended with a \*(lq/\*(rq. Entries that have been marked for extraction are 
-prepended with a \*(lq*\*(rq. If the verbose flag is set, the inode number of 
+List the current or specified directory. Entries that are directories are
+appended with a \*(lq/\*(rq. Entries that have been marked for extraction are
+prepended with a \*(lq*\*(rq. If the verbose flag is set, the inode number of
 each entry is also listed.
 .TP
 .B pwd
@@ -182,16 +182,16 @@ Print the full pathname of the current w
 immediately exits, even if the extraction list is not empty.
 .TP
 .B setmodes
-All directories that have been added to the extraction list have their owner, 
-modes, and times set; nothing is extracted from the dump. This is useful for 
-cleaning up after a 
-.B restore 
+All directories that have been added to the extraction list have their owner,
+modes, and times set; nothing is extracted from the dump. This is useful for
+cleaning up after a
+.B restore
 has been prematurely aborted.
 .TP
 .B verbose
-The sense of the 
+The sense of the
 .B \-v
-flag is toggled. When set, the verbose flag causes the 
+flag is toggled. When set, the verbose flag causes the
 .B ls
 command to list the inode numbers of all entries. It also causes
 .B restore
@@ -200,13 +200,13 @@ to print out information about each file
 .TP
 .BI \-P " file"
 .B Restore
-creates a new Quick File Access file 
+creates a new Quick File Access file
 .I file
 from an existing dump file without restoring its contents.
 .TP
 .B \-R
 .B Restore
-requests a particular tape of a multi-volume set on which to restart a full 
+requests a particular tape of a multi-volume set on which to restart a full
 restore (see the
 .B \-r
 flag below). This is useful if the restore has been interrupted.
@@ -223,7 +223,7 @@ level 0 backup. If the level 0 restores
 flag may be used to restore any necessary incremental backups on top of the
 level 0. The
 .B \-r
-flag precludes an interactive file extraction and can be detrimental to one's 
+flag precludes an interactive file extraction and can be detrimental to one's
 health (not to mention the disk) if not used carefully. An example:
 .IP
 .RS 14
@@ -236,9 +236,9 @@ health (not to mention the disk) if not
 .B restore rf /dev/st0
 .RE
 .IP
-Note that 
+Note that
 .B restore
-leaves a file 
+leaves a file
 .I restoresymtable
 in the root directory to pass information between incremental restore passes.
 This file should be removed when the last incremental has been restored.
@@ -251,7 +251,7 @@ and
 may be used to modify file system parameters such as size or block size.
 .TP
 .B \-t
-The names of the specified files are listed if they occur on the backup. If no 
+The names of the specified files are listed if they occur on the backup. If no
 file argument is given, the root directory is listed, which results in the
 entire content of the backup being listed, unless the
 .B \-h
@@ -262,12 +262,15 @@ flag replaces the function of the old
 program.  See also the
 .B \-X
 option below.
+If the
+.B \-0
+flag is used, the output separator is the null character (instead of the newline character).
 .TP
 .B \-x
-The named files are read from the given media. If a named file matches a 
+The named files are read from the given media. If a named file matches a
 directory whose contents are on the backup and the
 .B \-h
-flag is not specified, the directory is recursively extracted. The owner, 
+flag is not specified, the directory is recursively extracted. The owner,
 modification time, and mode are restored (if possible). If no file argument is
 given, the root directory is extracted, which results in the entire content of
 the backup being extracted, unless the
@@ -279,30 +282,30 @@ option below.
 The following additional options may be specified:
 .TP
 .B \-a
-In 
+In
 .B \-i
 or
 .B \-x
-mode, 
-.B restore 
-does ask the user for the volume number on which the files to be extracted are 
-supposed to be (in order to minimise the time by reading only the interesting 
-volumes). The 
+mode,
+.B restore
+does ask the user for the volume number on which the files to be extracted are
+supposed to be (in order to minimise the time by reading only the interesting
+volumes). The
 .B \-a
-option disables this behaviour and reads all the volumes starting with 1. This 
-option is useful when the operator does not know on which volume the files to 
+option disables this behaviour and reads all the volumes starting with 1. This
+option is useful when the operator does not know on which volume the files to
 be extracted are and/or when he prefers the longer unattended mode rather than
 the shorter interactive mode.
 .TP
 .BI \-A " archive_file"
 Read the table of contents from
 .I archive_file
-instead of the media. This option can be used in combination with the 
+instead of the media. This option can be used in combination with the
 .BR \-t ,
 .BR \-i ,
-or 
-.B \-x 
-options, making it possible to check whether files are on the media without 
+or
+.B \-x
+options, making it possible to check whether files are on the media without
 having to mount the media.
 .TP
 .BI \-b " blocksize"
@@ -315,7 +318,7 @@ tries to determine the media block size
 .B \-c
 Normally,
 .B restore
-will try to determine dynamically whether the dump was made from an old 
+will try to determine dynamically whether the dump was made from an old
 (pre-4.4) or new format file system. The
 .B \-c
 flag disables this check, and only allows reading a dump in the old format.
@@ -347,7 +350,7 @@ may be a special device file like
 (a disk drive), an ordinary file, or
 .I \-
 (the standard input). If the name of the file is of the form
-.I host:file 
+.I host:file
 or
 .IR user@host:file ,
 .B restore
@@ -355,21 +358,21 @@ reads from the named file on the remote
 .BR rmt (8).
 .TP
 .BI \-F " script"
-Run script at the beginning of each tape. The device name and the current 
-volume number are passed on the command line. The script must return 0 if 
+Run script at the beginning of each tape. The device name and the current
+volume number are passed on the command line. The script must return 0 if
 .B restore
-should continue without asking the user to change the tape, 1 if 
+should continue without asking the user to change the tape, 1 if
 .B restore
-should continue but ask the user to change the tape. Any other exit code will 
+should continue but ask the user to change the tape. Any other exit code will
 cause
 .B restore
 to abort. For security reasons,
 .B restore
-reverts back to the real user ID and the real group ID before running the 
+reverts back to the real user ID and the real group ID before running the
 script.
 .TP
 .B \-h
-Extract the actual directory, rather than the files that it references. This 
+Extract the actual directory, rather than the files that it references. This
 prevents hierarchical restoration of complete subtrees from the dump.
 .TP
 .BI \-H " hash_size"
@@ -381,7 +384,7 @@ price of much more memory usage. The def
 hashtable is used.
 .TP
 .B \-k
-Use Kerberos authentication when contacting the remote tape server. (Only 
+Use Kerberos authentication when contacting the remote tape server. (Only
 available if this options was enabled when
 .B restore
 was compiled.)
@@ -389,7 +392,7 @@ was compiled.)
 .B \-l
 When doing remote restores, assume the remote file is a regular file (instead
 of a tape device). If you're restoring a remote compressed file, you will need
-to specify this option or 
+to specify this option or
 .B restore
 will fail to access it correctly.
 .TP
@@ -400,26 +403,26 @@ flag allows the user to specify a maxima
 .B restore
 with the
 .B \-C
-option to check the backup. If this limit is reached, 
+option to check the backup. If this limit is reached,
 .B restore
-will abort with an error message. A value of 0 (the default value) disables 
+will abort with an error message. A value of 0 (the default value) disables
 the check.
 .TP
 .B \-m
 Extract by inode numbers rather than by file name. This is useful if only a few
-files are being extracted, and one wants to avoid regenerating the complete 
+files are being extracted, and one wants to avoid regenerating the complete
 pathname to the file.
 .TP
 .B \-M
-Enables the multi-volume feature (for reading dumps made using the 
+Enables the multi-volume feature (for reading dumps made using the
 .B \-M
 option of dump). The name specified with
 .B \-f
 is treated as a prefix and
 .B restore
-tries to read in sequence from 
-.I <prefix>001, <prefix>002 
-etc. 
+tries to read in sequence from
+.I <prefix>001, <prefix>002
+etc.
 .TP
 .B \-N
 The
@@ -440,7 +443,7 @@ The
 .B \-o
 flag causes
 .B restore
-to automatically restore the current directory permissions without asking the 
+to automatically restore the current directory permissions without asking the
 operator whether to do so in one of
 .B \-i
 or
@@ -451,32 +454,32 @@ modes.
 Use the file
 .I file
 in order to read tape position as stored using the dump Quick File Access mode,
-in one of 
+in one of
 .BR \-i ,
 .B \-x
 or
 .B \-t
 mode.
 .IP
-It is recommended to set up the st driver to return logical tape positions 
-rather than physical before calling 
+It is recommended to set up the st driver to return logical tape positions
+rather than physical before calling
 .B dump/restore
-with parameter 
+with parameter
 .BR \-Q .
-Since not all tape devices support physical tape positions those tape devices 
+Since not all tape devices support physical tape positions those tape devices
 return an error during
 .B dump/restore
 when the st driver is set to the default physical setting. Please see the
 .BR st (4)
-man page, option 
+man page, option
 .B MTSETDRVBUFFER
 , or the
 .BR mt(1)
 man page, on how to set the driver to return logical tape positions.
 .IP
-Before calling 
+Before calling
 .B restore
-with parameter 
+with parameter
 .BR \-Q ,
 always make sure the st driver is set to return the same type of tape position
 used during the call to
@@ -485,7 +488,7 @@ Otherwise
 .B restore
 may be confused.
 .IP
-This option can be used when restoring from local or remote tapes (see above) 
+This option can be used when restoring from local or remote tapes (see above)
 or from local or remote files.
 .TP
 .BI \-s " fileno"
@@ -497,16 +500,16 @@ on a multi-file tape. File numbering sta
 The
 .B \-T
 flag allows the user to specify a directory to use for the storage of temporary
-files. The default value is 
+files. The default value is
 .IR /tmp .
-This flag is most useful when restoring files after having booted from a 
+This flag is most useful when restoring files after having booted from a
 floppy. There might be little or no space on the floppy filesystem, but another
 source of space might exist.
 .TP
 .B \-u
-When creating certain types of files, 
+When creating certain types of files,
 .B restore
-may generate a warning diagnostic if they already exist in the target 
+may generate a warning diagnostic if they already exist in the target
 directory. To prevent this, the
 .B \-u
 (unlink) flag causes
@@ -518,16 +521,22 @@ Normally
 .B restore
 does its work silently. The
 .B \-v
-(verbose) flag causes it to type the name of each file it treats preceded by 
+(verbose) flag causes it to type the name of each file it treats preceded by
 its file type.
 .TP
+.B \-0
+(zero terminated) flag causes the output lines to be zero terminated,
+not line feed terminated. This flag is recognized for
+.B \-t
+(listing) only.
+.TP
 .B \-V
 Enables reading multi-volume non-tape mediums like CDROMs.
 .TP
 .BI \-X " filelist"
 Read list of files to be listed or extracted from the text file
 .I filelist
-in addition to those specified on the command line. This can be used in 
+in addition to those specified on the command line. This can be used in
 conjunction with the
 .B \-t
 or
@@ -544,10 +553,10 @@ may be an ordinary file or
 Do not ask the user whether to abort the restore in the event of an error.
 Always try to skip over the bad block(s) and continue.
 .PP
-(The 4.3BSD option syntax is implemented for backward compatibility but is not 
+(The 4.3BSD option syntax is implemented for backward compatibility but is not
 documented here.)
 .SH DIAGNOSTICS
-Complains if it gets a read error. If 
+Complains if it gets a read error. If
 .B y
 has been specified, or the user responds
 .BR y ,
@@ -584,12 +593,12 @@ A file that was not listed in the direct
 using a dump created on an active file system.
 .TP
 .I Incremental dump too low
-When doing an incremental restore, a dump that was written before the previous 
+When doing an incremental restore, a dump that was written before the previous
 incremental dump, or that has too low an incremental level has been loaded.
 .TP
 .I Incremental dump too high
 When doing an incremental restore, a dump that does not begin its coverage
-where the previous incremental dump left off, or that has too high an 
+where the previous incremental dump left off, or that has too high an
 incremental level has been loaded.
 .TP
 .I Tape read error while restoring <filename>
@@ -603,7 +612,7 @@ tape is trying to resynchronize, no extr
 files may not be found on the tape.
 .TP
 .I resync restore, skipped <num> blocks
-After a dump read error, 
+After a dump read error,
 .B restore
 may have to resynchronize itself. This message lists the number of blocks that
 were skipped over.
@@ -649,7 +658,7 @@ program.
 .TP
 .B RSH
 .B Restore
-uses the contents of this variable to determine the name of the remote shell 
+uses the contents of this variable to determine the name of the remote shell
 command to use when doing a network restore (rsh, ssh etc.). If this variable
 is not set,
 .BR rcmd (3)
@@ -677,10 +686,10 @@ information passed between incremental r
 can get confused when doing incremental restores from dumps that were made on
 active file systems.
 .PP
-A level 0 dump must be done after a full restore. Because 
+A level 0 dump must be done after a full restore. Because
 .B restore
 runs in user code, it has no control over inode allocation; thus a full dump
-must be done to get a new set of directories reflecting the new inode 
+must be done to get a new set of directories reflecting the new inode
 numbering, even though the content of the files is unchanged.
 .PP
 The temporary files
@@ -698,17 +707,17 @@ is used. Because
 .B \-R
 allows you to restart a
 .B \-r
-operation that may have been interrupted, the temporary files should be the 
-same across different processes. In all other cases, the files are unique 
-because it is possible to have two different dumps started at the same time, 
+operation that may have been interrupted, the temporary files should be the
+same across different processes. In all other cases, the files are unique
+because it is possible to have two different dumps started at the same time,
 and separate operations shouldn't conflict with each other.
 .PP
-To do a network restore, you have to run 
+To do a network restore, you have to run
 .B restore
-as root or use a remote shell replacement (see 
+as root or use a remote shell replacement (see
 .B RSH
-variable).  This is due to the previous security history of 
-.B dump 
+variable).  This is due to the previous security history of
+.B dump
 and
 .BR restore .
 (
@@ -725,12 +734,12 @@ modes (unless
 option is in use),
 .B restore
 will ask the operator whether to set the permissions on the current
-directory. If the operator confirms this action, the permissions 
-on the directory from where 
+directory. If the operator confirms this action, the permissions
+on the directory from where
 .B restore
 was launched will be replaced by the permissions on the dumped root
 inode. Although this behaviour is not really a bug, it has proven itself
-to be confusing for many users, so it is recommended to answer 'no', 
+to be confusing for many users, so it is recommended to answer 'no',
 unless you're performing a full restore and you do want to restore the
 permissions on '/'.
 .PP
@@ -740,14 +749,14 @@ It should be underlined that because it
 .B \-C
 option, sees the files as the kernel presents them, whereas
 .B dump
-sees all the files on a given filesystem. In particular, this 
+sees all the files on a given filesystem. In particular, this
 can cause some confusion when comparing a dumped filesystem a part
 of which is hidden by a filesystem mounted on top of it.
 .SH AUTHOR
 The
 .B dump/restore
-backup suite was ported to Linux's Second Extended File System by Remy Card 
-<card@Linux.EU.Org>. He maintained the initial versions of 
+backup suite was ported to Linux's Second Extended File System by Remy Card
+<card@Linux.EU.Org>. He maintained the initial versions of
 .B dump
 (up and including 0.4b4, released in January 1997).
 .PP
--- a/restore/restore.c
+++ b/restore/restore.c
@@ -92,12 +92,13 @@ listfile(char *name, dump_ino_t ino, int
 #ifdef USE_QFA
 	if (tapeposflag) {	/* add QFA positions to output */
 		(void)Inode2Tapepos(ino, &tnum, &tpos, 1);
-		fprintf(stdout, "%10lu\t%ld\t%lld\t%s\n", (unsigned long)ino,
-			tnum, tpos, name);
+		fprintf(stdout, "%10lu\t%ld\t%lld\t%s%c", (unsigned long)ino,
+						tnum, tpos, name, nullflag? '\0':'\n');
 	}
 	else
 #endif
-		fprintf(stdout, "%10lu\t%s\n", (unsigned long)ino, name);
+		 fprintf(stdout, "%10lu\t%s%c", (unsigned long)ino, name,
+						 nullflag? '\0': '\n');
 	return (descend);
 }
 
--- a/restore/restore.h
+++ b/restore/restore.h
@@ -62,6 +62,7 @@ extern int	uflag;		/* unlink symlink tar
 extern int	vflag;		/* print out actions taken */
 extern int	yflag;		/* always try to recover from tape errors */
 extern int	zflag;		/* tape is in compressed format */
+extern int	nullflag;	/* \0 separated output in t mode */
 extern int	ufs2flag;	/* tape is a FreeBSD UFS2 dump */
 extern char*	bot_script;	/* beginning of tape script */
 /*
