makefs: sync with NetBSD
This is a collection of minor changes as diff reduction against NetBSD. NetBSD revs: cd9660.c 1.39 cd9660.h 1.19 makefs.c 1.34 Obtained from: NetBSD Sponsored by: The FreeBSD Foundation
This commit is contained in:
parent
1811d6bf7f
commit
cfa6282553
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=316177
@ -162,6 +162,7 @@ static cd9660node *cd9660_create_directory(iso9660_disk *, const char *,
|
||||
cd9660node *, cd9660node *);
|
||||
static cd9660node *cd9660_create_special_directory(iso9660_disk *, u_char,
|
||||
cd9660node *);
|
||||
static int cd9660_add_generic_bootimage(iso9660_disk *, const char *);
|
||||
|
||||
|
||||
/*
|
||||
@ -2159,7 +2160,7 @@ cd9660_create_special_directory(iso9660_disk *diskStructure, u_char type,
|
||||
return temp;
|
||||
}
|
||||
|
||||
int
|
||||
static int
|
||||
cd9660_add_generic_bootimage(iso9660_disk *diskStructure, const char *bootimage)
|
||||
{
|
||||
struct stat stbuf;
|
||||
|
@ -322,7 +322,6 @@ void cd9660_time_915(unsigned char *, time_t);
|
||||
|
||||
/*** Boot Functions ***/
|
||||
int cd9660_write_generic_bootimage(FILE *);
|
||||
int cd9660_add_generic_bootimage(iso9660_disk *, const char *);
|
||||
int cd9660_write_boot(iso9660_disk *, FILE *);
|
||||
int cd9660_add_boot_disk(iso9660_disk *, const char *);
|
||||
int cd9660_eltorito_add_boot_option(iso9660_disk *, const char *,
|
||||
|
@ -84,7 +84,6 @@ struct stat stampst;
|
||||
static fstype_t *get_fstype(const char *);
|
||||
static int get_tstamp(const char *, struct stat *);
|
||||
static void usage(fstype_t *, fsinfo_t *);
|
||||
int main(int, char *[]);
|
||||
|
||||
int
|
||||
main(int argc, char *argv[])
|
||||
|
@ -186,7 +186,7 @@ DECLARE_FUN(cd9660);
|
||||
extern u_int debug;
|
||||
extern int dupsok;
|
||||
extern struct timespec start_time;
|
||||
extern struct stat stampst;
|
||||
extern struct stat stampst;
|
||||
|
||||
/*
|
||||
* If -x is specified, we want to exclude nodes which do not appear
|
||||
|
@ -40,6 +40,7 @@
|
||||
__FBSDID("$FreeBSD$");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/time.h>
|
||||
|
||||
#include <assert.h>
|
||||
@ -50,7 +51,6 @@ __FBSDID("$FreeBSD$");
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
#include "makefs.h"
|
||||
#include "mtree.h"
|
||||
|
Loading…
Reference in New Issue
Block a user