commit - 78727e915721cfd3a1033cd0a87081322297a1b0
commit + 32cb896c4b8b33da534b0d766496814425c71c52
blob - d6d844f392eb427a8383b358fdb19c26d6f9c7c8
blob + 537dfbc7f21349731f5c0fee299fae0f71be5f33
--- lib/delta.c
+++ lib/delta.c
#include "got_repository.h"
#include "got_object.h"
-#include "got_delta_priv.h"
-#include "got_path_priv.h"
-#include "got_zbuf_priv.h"
+#include "got_delta_lib.h"
+#include "got_path_lib.h"
+#include "got_zbuf_lib.h"
#ifndef MIN
#define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
blob - e7848245a0af4b13051e8fb54cfc4565303e8aaf
blob + 1a90ea1636849c048da1dabbca508c93bf1c720c
--- lib/diff.c
+++ lib/diff.c
#include "got_error.h"
#include "got_diff.h"
-#include "got_diff_priv.h"
-#include "got_path_priv.h"
+#include "got_diff_lib.h"
+#include "got_path_lib.h"
const struct got_error *
got_diff_blob(struct got_blob_object *blob1, struct got_blob_object *blob2,
blob - eb3bcf7d67c78107c2e4f2c86fe5fc3e7bfa1f46
blob + 87a1e5f57e6c41f013170935148c27ea8d8738e3
--- lib/diffreg.c
+++ lib/diffreg.c
#include "got_object.h"
#include "got_diff.h"
-#include "got_diff_priv.h"
+#include "got_diff_lib.h"
#define MINIMUM(a, b) (((a) < (b)) ? (a) : (b))
#define MAXIMUM(a, b) (((a) > (b)) ? (a) : (b))
blob - 653a6b140ea86094279af36022357ed7865fe0c4
blob + 6430af102b5eb0b9f230bf8989fd1606ad27ca06
--- lib/fileindex.c
+++ lib/fileindex.c
#include "got_error.h"
-#include "got_fileindex_priv.h"
+#include "got_fileindex_lib.h"
const struct got_error *
got_fileindex_entry_open(struct got_fileindex_entry **entry, const char *path,
blob - e34bc99ac2cc963e73e3c9b78104062681407ccb (mode 644)
blob + /dev/null
--- lib/got_delta_priv.h
+++ /dev/null
-/*
- * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-struct got_delta {
- SIMPLEQ_ENTRY(got_delta) entry;
- char *path_packfile;
- off_t offset;
- size_t tslen;
- int type;
- size_t size;
- off_t data_offset;
-};
-
-struct got_delta_chain {
- int nentries;
- SIMPLEQ_HEAD(, got_delta) entries;
-};
-
-struct got_delta *got_delta_open(const char *, off_t, size_t, int, size_t,
- off_t);
-void got_delta_close(struct got_delta *);
-const struct got_error *got_delta_chain_get_base_type(int *,
- struct got_delta_chain *);
-const struct got_error *got_delta_apply(FILE *, const uint8_t *, size_t,
- FILE *);
-
-/*
- * Definitions for delta data streams.
- */
-
-#define GOT_DELTA_STREAM_LENGTH_MIN 4 /* bytes */
-
-/*
- * A delta stream begins with two size fields. The first specifies the
- * size of the delta base, and the second describes the expected size of
- * the data which results from applying the delta to the delta base.
- *
- * Each size field uses a variable length encoding:
- * size0...sizeN form a 7+7+7+...+7 bit integer, where size0 is the
- * least significant part and sizeN is the most significant part.
- * If the MSB of a size byte is set, an additional size byte follows.
- */
-#define GOT_DELTA_SIZE_VAL_MASK 0x7f
-#define GOT_DELTA_SIZE_SHIFT 7
-#define GOT_DELTA_SIZE_MORE 0x80
-
-/*
- * The rest of the delta stream contains copy instructions.
- *
- * A base copy instruction copies N bytes starting at offset X from the delta
- * base to the output. Base copy instructions begin with a byte which has its
- * MSB set. The remaining bits of this byte describe how many offset and
- * length value bytes follow.
- * The offset X is encoded in 1 to 4 bytes, and the length N is encoded in
- * 1 to 3 bytes. For both values, the first byte contributes the least
- * significant part and the last byte which is present contributes the
- * most significant part.
- * If the offset value is omitted, an offset of zero is implied.
- * If the length value is omitted, a default length of 65536 bytes is implied.
- *
- * An inline copy instruction copies data from the delta stream to the output.
- * Such instructions begin with one byte which does not have the MSB set
- * and which specifies the length of the inline data which follows (i.e.
- * at most 127 bytes). A length value of zero is invalid.
- */
-
-#define GOT_DELTA_BASE_COPY 0x80
-
-#define GOT_DELTA_COPY_OFF1 0x01 /* byte 1 of offset is present */
-#define GOT_DELTA_COPY_OFF2 0x02 /* byte 2 of offset is present */
-#define GOT_DELTA_COPY_OFF3 0x04 /* byte 3 of offset is present */
-#define GOT_DELTA_COPY_OFF4 0x08 /* byte 4 of offset is present */
-
-#define GOT_DELTA_COPY_LEN1 0x10 /* byte 1 of length is present */
-#define GOT_DELTA_COPY_LEN2 0x20 /* byte 2 of length is present */
-#define GOT_DELTA_COPY_LEN3 0x40 /* byte 3 of length is present */
-
-#define GOT_DELTA_COPY_DEFAULT_OFF 0x0 /* default offset if omitted */
-#define GOT_DELTA_COPY_DEFAULT_LEN 0x10000 /* default length if omitted */
blob - /dev/null
blob + e34bc99ac2cc963e73e3c9b78104062681407ccb (mode 644)
--- /dev/null
+++ lib/got_delta_lib.h
+/*
+ * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+struct got_delta {
+ SIMPLEQ_ENTRY(got_delta) entry;
+ char *path_packfile;
+ off_t offset;
+ size_t tslen;
+ int type;
+ size_t size;
+ off_t data_offset;
+};
+
+struct got_delta_chain {
+ int nentries;
+ SIMPLEQ_HEAD(, got_delta) entries;
+};
+
+struct got_delta *got_delta_open(const char *, off_t, size_t, int, size_t,
+ off_t);
+void got_delta_close(struct got_delta *);
+const struct got_error *got_delta_chain_get_base_type(int *,
+ struct got_delta_chain *);
+const struct got_error *got_delta_apply(FILE *, const uint8_t *, size_t,
+ FILE *);
+
+/*
+ * Definitions for delta data streams.
+ */
+
+#define GOT_DELTA_STREAM_LENGTH_MIN 4 /* bytes */
+
+/*
+ * A delta stream begins with two size fields. The first specifies the
+ * size of the delta base, and the second describes the expected size of
+ * the data which results from applying the delta to the delta base.
+ *
+ * Each size field uses a variable length encoding:
+ * size0...sizeN form a 7+7+7+...+7 bit integer, where size0 is the
+ * least significant part and sizeN is the most significant part.
+ * If the MSB of a size byte is set, an additional size byte follows.
+ */
+#define GOT_DELTA_SIZE_VAL_MASK 0x7f
+#define GOT_DELTA_SIZE_SHIFT 7
+#define GOT_DELTA_SIZE_MORE 0x80
+
+/*
+ * The rest of the delta stream contains copy instructions.
+ *
+ * A base copy instruction copies N bytes starting at offset X from the delta
+ * base to the output. Base copy instructions begin with a byte which has its
+ * MSB set. The remaining bits of this byte describe how many offset and
+ * length value bytes follow.
+ * The offset X is encoded in 1 to 4 bytes, and the length N is encoded in
+ * 1 to 3 bytes. For both values, the first byte contributes the least
+ * significant part and the last byte which is present contributes the
+ * most significant part.
+ * If the offset value is omitted, an offset of zero is implied.
+ * If the length value is omitted, a default length of 65536 bytes is implied.
+ *
+ * An inline copy instruction copies data from the delta stream to the output.
+ * Such instructions begin with one byte which does not have the MSB set
+ * and which specifies the length of the inline data which follows (i.e.
+ * at most 127 bytes). A length value of zero is invalid.
+ */
+
+#define GOT_DELTA_BASE_COPY 0x80
+
+#define GOT_DELTA_COPY_OFF1 0x01 /* byte 1 of offset is present */
+#define GOT_DELTA_COPY_OFF2 0x02 /* byte 2 of offset is present */
+#define GOT_DELTA_COPY_OFF3 0x04 /* byte 3 of offset is present */
+#define GOT_DELTA_COPY_OFF4 0x08 /* byte 4 of offset is present */
+
+#define GOT_DELTA_COPY_LEN1 0x10 /* byte 1 of length is present */
+#define GOT_DELTA_COPY_LEN2 0x20 /* byte 2 of length is present */
+#define GOT_DELTA_COPY_LEN3 0x40 /* byte 3 of length is present */
+
+#define GOT_DELTA_COPY_DEFAULT_OFF 0x0 /* default offset if omitted */
+#define GOT_DELTA_COPY_DEFAULT_LEN 0x10000 /* default length if omitted */
blob - d0351038fd1aa497adf26fcd0cc40fab666f7061 (mode 644)
blob + /dev/null
--- lib/got_diff_priv.h
+++ /dev/null
-
-
-/*ROR
- * Copyright (c) 1991, 1993
- * The Regents of the University of California. 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.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
- *
- * @(#)diff.h 8.1 (Berkeley) 6/6/93
- */
-
-#include <sys/types.h>
-#include <regex.h>
-
-/*
- * Output format options
- */
-#define D_NORMAL 0 /* Normal output */
-#define D_EDIT -1 /* Editor script out */
-#define D_REVERSE 1 /* Reverse editor script */
-#define D_CONTEXT 2 /* Diff with context */
-#define D_UNIFIED 3 /* Unified context diff */
-#define D_IFDEF 4 /* Diff with merged #ifdef's */
-#define D_NREVERSE 5 /* Reverse ed script with numbered
- lines and no trailing . */
-#define D_BRIEF 6 /* Say if the files differ */
-
-/*
- * Output flags
- */
-#define D_HEADER 0x001 /* Print a header/footer between files */
-#define D_EMPTY1 0x002 /* Treat first file as empty (/dev/null) */
-#define D_EMPTY2 0x004 /* Treat second file as empty (/dev/null) */
-
-/*
- * Command line flags
- */
-#define D_FORCEASCII 0x008 /* Treat file as ascii regardless of content */
-#define D_FOLDBLANKS 0x010 /* Treat all white space as equal */
-#define D_MINIMAL 0x020 /* Make diff as small as possible */
-#define D_IGNORECASE 0x040 /* Case-insensitive matching */
-#define D_PROTOTYPE 0x080 /* Display C function prototype */
-#define D_EXPANDTABS 0x100 /* Expand tabs to spaces */
-#define D_IGNOREBLANKS 0x200 /* Ignore white space changes */
-
-/*
- * Status values for print_status() and diffreg() return values
- */
-#define D_SAME 0 /* Files are the same */
-#define D_DIFFER 1 /* Files are different */
-#define D_BINARY 2 /* Binary files are different */
-#define D_MISMATCH1 3 /* path1 was a dir, path2 a file */
-#define D_MISMATCH2 4 /* path1 was a file, path2 a dir */
-#define D_SKIPPED1 5 /* path1 was a special file */
-#define D_SKIPPED2 6 /* path2 was a special file */
-
-struct excludes {
- char *pattern;
- struct excludes *next;
-};
-
-struct got_diff_state {
- int *J; /* will be overlaid on class */
- int *class; /* will be overlaid on file[0] */
- int *klist; /* will be overlaid on file[0] after class */
- int *member; /* will be overlaid on file[1] */
- int clen;
- int inifdef; /* whether or not we are in a #ifdef block */
- int len[2];
- int pref, suff; /* length of prefix and suffix */
- int slen[2];
- int anychange;
- long *ixnew; /* will be overlaid on file[1] */
- long *ixold; /* will be overlaid on klist */
- struct cand *clist; /* merely a free storage pot for candidates */
- int clistlen; /* the length of clist */
- struct line *sfile[2]; /* shortened by pruning common prefix/suffix */
- u_char *chrtran; /* translation table for case-folding */
- struct context_vec *context_vec_start;
- struct context_vec *context_vec_end;
- struct context_vec *context_vec_ptr;
- struct line *file[2];
-#define FUNCTION_CONTEXT_SIZE 55
- char lastbuf[FUNCTION_CONTEXT_SIZE];
- int lastline;
- int lastmatchline;
- struct stat stb1, stb2;
-};
-
-struct got_diff_args {
- int Tflag;
- int diff_format, diff_context, status;
- char *ifdefname, *diffargs, *ignore_pats;
- const char *label[2];
-};
-
-char *splice(char *, char *);
-const struct got_error *got_diffreg(int *, FILE *,
- FILE *, int, struct got_diff_args *, struct got_diff_state *, FILE *);
-int easprintf(char **, const char *, ...);
-void *emalloc(size_t);
-void *erealloc(void *, size_t);
-void diffdir(char *, char *, int);
-void print_only(const char *, size_t, const char *);
-void print_status(int, char *, char *, char *);
blob - /dev/null
blob + d0351038fd1aa497adf26fcd0cc40fab666f7061 (mode 644)
--- /dev/null
+++ lib/got_diff_lib.h
+
+
+/*ROR
+ * Copyright (c) 1991, 1993
+ * The Regents of the University of California. 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.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ *
+ * @(#)diff.h 8.1 (Berkeley) 6/6/93
+ */
+
+#include <sys/types.h>
+#include <regex.h>
+
+/*
+ * Output format options
+ */
+#define D_NORMAL 0 /* Normal output */
+#define D_EDIT -1 /* Editor script out */
+#define D_REVERSE 1 /* Reverse editor script */
+#define D_CONTEXT 2 /* Diff with context */
+#define D_UNIFIED 3 /* Unified context diff */
+#define D_IFDEF 4 /* Diff with merged #ifdef's */
+#define D_NREVERSE 5 /* Reverse ed script with numbered
+ lines and no trailing . */
+#define D_BRIEF 6 /* Say if the files differ */
+
+/*
+ * Output flags
+ */
+#define D_HEADER 0x001 /* Print a header/footer between files */
+#define D_EMPTY1 0x002 /* Treat first file as empty (/dev/null) */
+#define D_EMPTY2 0x004 /* Treat second file as empty (/dev/null) */
+
+/*
+ * Command line flags
+ */
+#define D_FORCEASCII 0x008 /* Treat file as ascii regardless of content */
+#define D_FOLDBLANKS 0x010 /* Treat all white space as equal */
+#define D_MINIMAL 0x020 /* Make diff as small as possible */
+#define D_IGNORECASE 0x040 /* Case-insensitive matching */
+#define D_PROTOTYPE 0x080 /* Display C function prototype */
+#define D_EXPANDTABS 0x100 /* Expand tabs to spaces */
+#define D_IGNOREBLANKS 0x200 /* Ignore white space changes */
+
+/*
+ * Status values for print_status() and diffreg() return values
+ */
+#define D_SAME 0 /* Files are the same */
+#define D_DIFFER 1 /* Files are different */
+#define D_BINARY 2 /* Binary files are different */
+#define D_MISMATCH1 3 /* path1 was a dir, path2 a file */
+#define D_MISMATCH2 4 /* path1 was a file, path2 a dir */
+#define D_SKIPPED1 5 /* path1 was a special file */
+#define D_SKIPPED2 6 /* path2 was a special file */
+
+struct excludes {
+ char *pattern;
+ struct excludes *next;
+};
+
+struct got_diff_state {
+ int *J; /* will be overlaid on class */
+ int *class; /* will be overlaid on file[0] */
+ int *klist; /* will be overlaid on file[0] after class */
+ int *member; /* will be overlaid on file[1] */
+ int clen;
+ int inifdef; /* whether or not we are in a #ifdef block */
+ int len[2];
+ int pref, suff; /* length of prefix and suffix */
+ int slen[2];
+ int anychange;
+ long *ixnew; /* will be overlaid on file[1] */
+ long *ixold; /* will be overlaid on klist */
+ struct cand *clist; /* merely a free storage pot for candidates */
+ int clistlen; /* the length of clist */
+ struct line *sfile[2]; /* shortened by pruning common prefix/suffix */
+ u_char *chrtran; /* translation table for case-folding */
+ struct context_vec *context_vec_start;
+ struct context_vec *context_vec_end;
+ struct context_vec *context_vec_ptr;
+ struct line *file[2];
+#define FUNCTION_CONTEXT_SIZE 55
+ char lastbuf[FUNCTION_CONTEXT_SIZE];
+ int lastline;
+ int lastmatchline;
+ struct stat stb1, stb2;
+};
+
+struct got_diff_args {
+ int Tflag;
+ int diff_format, diff_context, status;
+ char *ifdefname, *diffargs, *ignore_pats;
+ const char *label[2];
+};
+
+char *splice(char *, char *);
+const struct got_error *got_diffreg(int *, FILE *,
+ FILE *, int, struct got_diff_args *, struct got_diff_state *, FILE *);
+int easprintf(char **, const char *, ...);
+void *emalloc(size_t);
+void *erealloc(void *, size_t);
+void diffdir(char *, char *, int);
+void print_only(const char *, size_t, const char *);
+void print_status(int, char *, char *, char *);
blob - 298e2ba798ab4dd2c8023f73a4aa5d2bd950b746 (mode 644)
blob + /dev/null
--- lib/got_fileindex_priv.h
+++ /dev/null
-/*
- * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * State information for a tracked file in a work tree.
- * When written to disk, multi-byte fields are written in big-endian.
- * Some fields are based on results from stat(2). These are only used in
- * order to detect modifications made to on-disk files, they are never
- * applied back to the filesystem.
- */
-struct got_fileindex_entry {
- TAILQ_ENTRY(got_fileindex_entry) entry;
- uint64_t ctime_sec;
- uint64_t ctime_nsec;
- uint64_t mtime_sec;
- uint64_t mtime_nsec;
- uint32_t uid;
- uint32_t gid;
- /*
- * On-disk size is truncated to the lower 32 bits.
- * The value is only used to check for modifications anyway.
- */
- uint32_t size;
-
- uint16_t mode;
-#define GOT_INDEX_ENTRY_MODE_FILE_TYPE 0x000f
-#define GOT_INDEX_ENTRY_MODE_REGULAR_FILE 1
-#define GOT_INDEX_ENTRY_MODE_SYMLINK 2
-#define GOT_INDEX_ENTRY_MODE_PERMS 0xff10
-#define GOT_INDEX_ENTRY_MODE_PERMS_SHIFT 4
-
- /* SHA1 of corresponding blob in repository. */
- uint8_t blob_sha1[SHA1_DIGEST_LENGTH];
-
- uint32_t flags;
-#define GOT_INDEX_ENTRY_F_PATH_LEN 0x00000fff
-#define GOT_INDEX_ENTRY_F_STAGE 0x00003000
-#define GOT_INDEX_ENTRY_F_EXTENDED 0x00004000
-#define GOT_INDEX_ENTRY_F_ASSUME_VALID 0x00008000
-
- /*
- * UNIX-style path, relative to work tree root.
- * Variable length, and NUL-padded to a multiple of 8 on disk.
- */
- char *path;
-};
-
-/* "Stages" of a file afflicted by a 3-way merge conflict. */
-#define GOT_INDEX_ENTRY_STAGE_MERGED 0
-#define GOT_INDEX_ENTRY_STAGE_ANCESTOR 1
-#define GOT_INDEX_ENTRY_STAGE_OURS 2
-#define GOT_INDEX_ENTRY_STAGE_THEIRS 3
-
-/* On-disk file index header structure. */
-struct got_fileindex_hdr {
- uint32_t signature; /* big-endian on disk */
- uint32_t version; /* big-endian on disk */
-#define GOT_FILE_INDEX_VERSION 1
- uint32_t nentries; /* big-endian on disk */
- TAILQ_HEAD(, got_fileindex_entry) entries;
- uint8_t sha1[SHA1_DIGEST_LENGTH]; /* checksum of above on-disk data */
-};
-
-const struct got_error *got_fileindex_entry_open(struct got_fileindex_entry **,
- const char *, uint8_t *);
-void got_fileindex_entry_close(struct got_fileindex_entry *);
blob - /dev/null
blob + 298e2ba798ab4dd2c8023f73a4aa5d2bd950b746 (mode 644)
--- /dev/null
+++ lib/got_fileindex_lib.h
+/*
+ * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/*
+ * State information for a tracked file in a work tree.
+ * When written to disk, multi-byte fields are written in big-endian.
+ * Some fields are based on results from stat(2). These are only used in
+ * order to detect modifications made to on-disk files, they are never
+ * applied back to the filesystem.
+ */
+struct got_fileindex_entry {
+ TAILQ_ENTRY(got_fileindex_entry) entry;
+ uint64_t ctime_sec;
+ uint64_t ctime_nsec;
+ uint64_t mtime_sec;
+ uint64_t mtime_nsec;
+ uint32_t uid;
+ uint32_t gid;
+ /*
+ * On-disk size is truncated to the lower 32 bits.
+ * The value is only used to check for modifications anyway.
+ */
+ uint32_t size;
+
+ uint16_t mode;
+#define GOT_INDEX_ENTRY_MODE_FILE_TYPE 0x000f
+#define GOT_INDEX_ENTRY_MODE_REGULAR_FILE 1
+#define GOT_INDEX_ENTRY_MODE_SYMLINK 2
+#define GOT_INDEX_ENTRY_MODE_PERMS 0xff10
+#define GOT_INDEX_ENTRY_MODE_PERMS_SHIFT 4
+
+ /* SHA1 of corresponding blob in repository. */
+ uint8_t blob_sha1[SHA1_DIGEST_LENGTH];
+
+ uint32_t flags;
+#define GOT_INDEX_ENTRY_F_PATH_LEN 0x00000fff
+#define GOT_INDEX_ENTRY_F_STAGE 0x00003000
+#define GOT_INDEX_ENTRY_F_EXTENDED 0x00004000
+#define GOT_INDEX_ENTRY_F_ASSUME_VALID 0x00008000
+
+ /*
+ * UNIX-style path, relative to work tree root.
+ * Variable length, and NUL-padded to a multiple of 8 on disk.
+ */
+ char *path;
+};
+
+/* "Stages" of a file afflicted by a 3-way merge conflict. */
+#define GOT_INDEX_ENTRY_STAGE_MERGED 0
+#define GOT_INDEX_ENTRY_STAGE_ANCESTOR 1
+#define GOT_INDEX_ENTRY_STAGE_OURS 2
+#define GOT_INDEX_ENTRY_STAGE_THEIRS 3
+
+/* On-disk file index header structure. */
+struct got_fileindex_hdr {
+ uint32_t signature; /* big-endian on disk */
+ uint32_t version; /* big-endian on disk */
+#define GOT_FILE_INDEX_VERSION 1
+ uint32_t nentries; /* big-endian on disk */
+ TAILQ_HEAD(, got_fileindex_entry) entries;
+ uint8_t sha1[SHA1_DIGEST_LENGTH]; /* checksum of above on-disk data */
+};
+
+const struct got_error *got_fileindex_entry_open(struct got_fileindex_entry **,
+ const char *, uint8_t *);
+void got_fileindex_entry_close(struct got_fileindex_entry *);
blob - 156901f0339a8945664abed5e3624a696e2ea8b5 (mode 644)
blob + /dev/null
--- lib/got_object_priv.h
+++ /dev/null
-/*
- * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-struct got_object_id {
- u_int8_t sha1[SHA1_DIGEST_LENGTH];
-};
-
-struct got_object {
- int type;
- int flags;
-#define GOT_OBJ_FLAG_PACKED 0x01
-#define GOT_OBJ_FLAG_DELTIFIED 0x02
-
- size_t hdrlen;
- size_t size;
- struct got_object_id id;
-
- char *path_packfile; /* if packed */
- off_t pack_offset; /* if packed */
- struct got_delta_chain deltas; /* if deltified */
-};
-
-struct got_blob_object {
- FILE *f;
- struct got_zstream_buf zb;
- size_t hdrlen;
- size_t blocksize;
- uint8_t *read_buf;
- int flags;
-#define GOT_BLOB_F_COMPRESSED 0x01
- struct got_object_id id;
-};
blob - /dev/null
blob + 156901f0339a8945664abed5e3624a696e2ea8b5 (mode 644)
--- /dev/null
+++ lib/got_object_lib.h
+/*
+ * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+struct got_object_id {
+ u_int8_t sha1[SHA1_DIGEST_LENGTH];
+};
+
+struct got_object {
+ int type;
+ int flags;
+#define GOT_OBJ_FLAG_PACKED 0x01
+#define GOT_OBJ_FLAG_DELTIFIED 0x02
+
+ size_t hdrlen;
+ size_t size;
+ struct got_object_id id;
+
+ char *path_packfile; /* if packed */
+ off_t pack_offset; /* if packed */
+ struct got_delta_chain deltas; /* if deltified */
+};
+
+struct got_blob_object {
+ FILE *f;
+ struct got_zstream_buf zb;
+ size_t hdrlen;
+ size_t blocksize;
+ uint8_t *read_buf;
+ int flags;
+#define GOT_BLOB_F_COMPRESSED 0x01
+ struct got_object_id id;
+};
blob - 348ae1a580907c62f979bb861cdde189a32ca3af (mode 644)
blob + /dev/null
--- lib/got_pack_priv.h
+++ /dev/null
-/*
- * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* See Documentation/technical/pack-format.txt in Git. */
-
-struct got_packidx_trailer {
- u_int8_t packfile_sha1[SHA1_DIGEST_LENGTH];
- u_int8_t packidx_sha1[SHA1_DIGEST_LENGTH];
-} __attribute__((__packed__));
-
-/* Ignore pack index version 1 which is no longer written by Git. */
-#define GOT_PACKIDX_VERSION 2
-
-struct got_packidx_v2_hdr {
- uint32_t magic; /* big endian */
-#define GOT_PACKIDX_V2_MAGIC 0xff744f63 /* "\377t0c" */
- uint32_t version;
-
- /*
- * Each entry N in the fanout table contains the number of objects in
- * the packfile whose SHA1 begins with a byte less than or equal to N.
- * The last entry (index 255) contains the number of objects in the
- * pack file whose first SHA1 byte is <= 0xff, and thus records the
- * total number of objects in the pack file. All pointer variables
- * below point to tables with a corresponding number of entries.
- */
- uint32_t fanout_table[0xff + 1]; /* values are big endian */
-
- /* Sorted SHA1 checksums for each object in the pack file. */
- struct got_object_id *sorted_ids;
-
- /* CRC32 of the packed representation of each object. */
- uint32_t *crc32;
-
- /* Offset into the pack file for each object. */
- uint32_t *offsets; /* values are big endian */
-#define GOT_PACKIDX_OFFSET_VAL_MASK 0x7fffffff
-#define GOT_PACKIDX_OFFSET_VAL_IS_LARGE_IDX 0x80000000
-
- /* Large offsets table is empty for pack files < 2 GB. */
- uint64_t *large_offsets; /* values are big endian */
-
- struct got_packidx_trailer trailer;
-};
-
-struct got_packfile_hdr {
- uint32_t signature;
-#define GOT_PACKFILE_SIGNATURE 0x5041434b /* 'P' 'A' 'C' 'K' */
- uint32_t version; /* big endian */
-#define GOT_PACKFILE_VERSION 2
- uint32_t nobjects; /* big endian */
-};
-
-struct got_packfile_obj_hdr {
- /*
- * The object size field uses a variable length encoding:
- * size0...sizeN form a 4+7+7+...+7 bit integer, where size0 is the
- * least significant part and sizeN is the most significant part.
- * If the MSB of a size byte is set, an additional size byte follows.
- * Of the 7 remaining bits of size0, the first 3 bits indicate the
- * object's type, and the remaining 4 bits contribute to the size.
- */
- uint8_t *size; /* variable length */
-#define GOT_PACK_OBJ_SIZE_MORE 0x80
-#define GOT_PACK_OBJ_SIZE0_TYPE_MASK 0x70 /* See struct got_object->type */
-#define GOT_PACK_OBJ_SIZE0_TYPE_MASK_SHIFT 4
-#define GOT_PACK_OBJ_SIZE0_VAL_MASK 0x0f
-#define GOT_PACK_OBJ_SIZE_VAL_MASK 0x7f
-};
-
-/* If object is not a DELTA type. */
-struct got_packfile_object_data {
- uint8_t *data; /* compressed */
-};
-
-/* If object is of type GOT_OBJ_TYPE_REF_DELTA. */
-struct got_packfile_object_data_ref_delta {
- uint8_t sha1[SHA1_DIGEST_LENGTH];
- uint8_t *delta_data; /* compressed */
-};
-
-/* If object is of type GOT_OBJ_TYPE_OFFSET_DELTA. */
-struct got_packfile_object_data_offset_delta {
- /*
- * This offset is interpreted as a negative offset from
- * the got_packfile_obj_hdr corresponding to this object.
- * The size provided in the header specifies the amount
- * of compressed delta data that follows.
- *
- * This field uses a variable length encoding of N bytes,
- * where the MSB is always set except for the last byte.
- * The value is encoded as a series of N 7 bit integers,
- * which are concatenated, and if N > 1 the value 2^7 +
- * 2^14 + ... + 2^(7 * (n-1)) is added to the result.
- */
- uint8_t *offset; /* variable length */
-#define GOT_PACK_OBJ_DELTA_OFF_MORE 0x80
-#define GOT_PACK_OBJ_DELTA_OFF_VAL_MASK 0x7f
- uint8_t *delta_data; /* compressed */
-};
-
-struct got_packfile_obj_data {
- union {
- struct got_packfile_object_data data;
- struct got_packfile_object_data_ref_delta ref_delta;
- struct got_packfile_object_data_offset_delta offset_delta;
- } __attribute__((__packed__));
-} __attribute__((__packed__));
-
-const struct got_error *got_packidx_open(struct got_packidx_v2_hdr **,
- const char *);
-void got_packidx_close(struct got_packidx_v2_hdr *);
-
-const struct got_error *got_packfile_open_object(struct got_object **,
- struct got_object_id *, struct got_repository *);
-const struct got_error *got_packfile_extract_object(FILE **,
- struct got_object *, struct got_repository *);
blob - /dev/null
blob + 348ae1a580907c62f979bb861cdde189a32ca3af (mode 644)
--- /dev/null
+++ lib/got_pack_lib.h
+/*
+ * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* See Documentation/technical/pack-format.txt in Git. */
+
+struct got_packidx_trailer {
+ u_int8_t packfile_sha1[SHA1_DIGEST_LENGTH];
+ u_int8_t packidx_sha1[SHA1_DIGEST_LENGTH];
+} __attribute__((__packed__));
+
+/* Ignore pack index version 1 which is no longer written by Git. */
+#define GOT_PACKIDX_VERSION 2
+
+struct got_packidx_v2_hdr {
+ uint32_t magic; /* big endian */
+#define GOT_PACKIDX_V2_MAGIC 0xff744f63 /* "\377t0c" */
+ uint32_t version;
+
+ /*
+ * Each entry N in the fanout table contains the number of objects in
+ * the packfile whose SHA1 begins with a byte less than or equal to N.
+ * The last entry (index 255) contains the number of objects in the
+ * pack file whose first SHA1 byte is <= 0xff, and thus records the
+ * total number of objects in the pack file. All pointer variables
+ * below point to tables with a corresponding number of entries.
+ */
+ uint32_t fanout_table[0xff + 1]; /* values are big endian */
+
+ /* Sorted SHA1 checksums for each object in the pack file. */
+ struct got_object_id *sorted_ids;
+
+ /* CRC32 of the packed representation of each object. */
+ uint32_t *crc32;
+
+ /* Offset into the pack file for each object. */
+ uint32_t *offsets; /* values are big endian */
+#define GOT_PACKIDX_OFFSET_VAL_MASK 0x7fffffff
+#define GOT_PACKIDX_OFFSET_VAL_IS_LARGE_IDX 0x80000000
+
+ /* Large offsets table is empty for pack files < 2 GB. */
+ uint64_t *large_offsets; /* values are big endian */
+
+ struct got_packidx_trailer trailer;
+};
+
+struct got_packfile_hdr {
+ uint32_t signature;
+#define GOT_PACKFILE_SIGNATURE 0x5041434b /* 'P' 'A' 'C' 'K' */
+ uint32_t version; /* big endian */
+#define GOT_PACKFILE_VERSION 2
+ uint32_t nobjects; /* big endian */
+};
+
+struct got_packfile_obj_hdr {
+ /*
+ * The object size field uses a variable length encoding:
+ * size0...sizeN form a 4+7+7+...+7 bit integer, where size0 is the
+ * least significant part and sizeN is the most significant part.
+ * If the MSB of a size byte is set, an additional size byte follows.
+ * Of the 7 remaining bits of size0, the first 3 bits indicate the
+ * object's type, and the remaining 4 bits contribute to the size.
+ */
+ uint8_t *size; /* variable length */
+#define GOT_PACK_OBJ_SIZE_MORE 0x80
+#define GOT_PACK_OBJ_SIZE0_TYPE_MASK 0x70 /* See struct got_object->type */
+#define GOT_PACK_OBJ_SIZE0_TYPE_MASK_SHIFT 4
+#define GOT_PACK_OBJ_SIZE0_VAL_MASK 0x0f
+#define GOT_PACK_OBJ_SIZE_VAL_MASK 0x7f
+};
+
+/* If object is not a DELTA type. */
+struct got_packfile_object_data {
+ uint8_t *data; /* compressed */
+};
+
+/* If object is of type GOT_OBJ_TYPE_REF_DELTA. */
+struct got_packfile_object_data_ref_delta {
+ uint8_t sha1[SHA1_DIGEST_LENGTH];
+ uint8_t *delta_data; /* compressed */
+};
+
+/* If object is of type GOT_OBJ_TYPE_OFFSET_DELTA. */
+struct got_packfile_object_data_offset_delta {
+ /*
+ * This offset is interpreted as a negative offset from
+ * the got_packfile_obj_hdr corresponding to this object.
+ * The size provided in the header specifies the amount
+ * of compressed delta data that follows.
+ *
+ * This field uses a variable length encoding of N bytes,
+ * where the MSB is always set except for the last byte.
+ * The value is encoded as a series of N 7 bit integers,
+ * which are concatenated, and if N > 1 the value 2^7 +
+ * 2^14 + ... + 2^(7 * (n-1)) is added to the result.
+ */
+ uint8_t *offset; /* variable length */
+#define GOT_PACK_OBJ_DELTA_OFF_MORE 0x80
+#define GOT_PACK_OBJ_DELTA_OFF_VAL_MASK 0x7f
+ uint8_t *delta_data; /* compressed */
+};
+
+struct got_packfile_obj_data {
+ union {
+ struct got_packfile_object_data data;
+ struct got_packfile_object_data_ref_delta ref_delta;
+ struct got_packfile_object_data_offset_delta offset_delta;
+ } __attribute__((__packed__));
+} __attribute__((__packed__));
+
+const struct got_error *got_packidx_open(struct got_packidx_v2_hdr **,
+ const char *);
+void got_packidx_close(struct got_packidx_v2_hdr *);
+
+const struct got_error *got_packfile_open_object(struct got_object **,
+ struct got_object_id *, struct got_repository *);
+const struct got_error *got_packfile_extract_object(FILE **,
+ struct got_object *, struct got_repository *);
blob - 977e6fa24ee0d199aed7f2654832d0b74fc28e31 (mode 644)
blob + /dev/null
--- lib/got_path_priv.h
+++ /dev/null
-/*
- * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* Utilities for dealing with filesystem paths. */
-
-#define GOT_DEFAULT_FILE_MODE (S_IRUSR|S_IWUSR | S_IRGRP | S_IROTH)
-#define GOT_DEFAULT_DIR_MODE (S_IRWXU | S_IRGRP|S_IXGRP | S_IROTH|S_IXOTH)
-
-/* Determine whether a path is an absolute path. */
-int got_path_is_absolute(const char *);
-
-/*
- * Return an absolute version of a relative path.
- * The result is allocated with malloc(3).
- */
-char *got_path_get_absolute(const char *);
-
-/*
- * Normalize a path for internal processing.
- * The result is allocated with malloc(3).
- */
-char *got_path_normalize(const char *);
-
-/* Open a new temporary file for writing.
- * The file is not visible in the filesystem. */
-FILE *got_opentemp(void);
blob - /dev/null
blob + 977e6fa24ee0d199aed7f2654832d0b74fc28e31 (mode 644)
--- /dev/null
+++ lib/got_path_lib.h
+/*
+ * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* Utilities for dealing with filesystem paths. */
+
+#define GOT_DEFAULT_FILE_MODE (S_IRUSR|S_IWUSR | S_IRGRP | S_IROTH)
+#define GOT_DEFAULT_DIR_MODE (S_IRWXU | S_IRGRP|S_IXGRP | S_IROTH|S_IXOTH)
+
+/* Determine whether a path is an absolute path. */
+int got_path_is_absolute(const char *);
+
+/*
+ * Return an absolute version of a relative path.
+ * The result is allocated with malloc(3).
+ */
+char *got_path_get_absolute(const char *);
+
+/*
+ * Normalize a path for internal processing.
+ * The result is allocated with malloc(3).
+ */
+char *got_path_normalize(const char *);
+
+/* Open a new temporary file for writing.
+ * The file is not visible in the filesystem. */
+FILE *got_opentemp(void);
blob - 104167f68a48a72f7981d96d863de1f3e09e7fac (mode 644)
blob + /dev/null
--- lib/got_repository_priv.h
+++ /dev/null
-/*
- * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#define GOT_PACKIDX_CACHE_SIZE 64
-
-struct got_repository {
- char *path;
-
- /* The pack index cache speeds up search for packed objects. */
- struct got_packidx_v2_hdr *packidx_cache[GOT_PACKIDX_CACHE_SIZE];
-};
-
blob - /dev/null
blob + 104167f68a48a72f7981d96d863de1f3e09e7fac (mode 644)
--- /dev/null
+++ lib/got_repository_lib.h
+/*
+ * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#define GOT_PACKIDX_CACHE_SIZE 64
+
+struct got_repository {
+ char *path;
+
+ /* The pack index cache speeds up search for packed objects. */
+ struct got_packidx_v2_hdr *packidx_cache[GOT_PACKIDX_CACHE_SIZE];
+};
+
blob - d207ee390d6e7f6252e01034122dc9e112bfd66d (mode 644)
blob + /dev/null
--- lib/got_sha1_priv.h
+++ /dev/null
-/*
- * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#define GOT_SHA1_STRING_ZERO "0000000000000000000000000000000000000000"
-
-int got_parse_sha1_digest(uint8_t *, const char *);
-char *got_sha1_digest_to_str(const uint8_t *, char *, size_t);
blob - /dev/null
blob + d207ee390d6e7f6252e01034122dc9e112bfd66d (mode 644)
--- /dev/null
+++ lib/got_sha1_lib.h
+/*
+ * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#define GOT_SHA1_STRING_ZERO "0000000000000000000000000000000000000000"
+
+int got_parse_sha1_digest(uint8_t *, const char *);
+char *got_sha1_digest_to_str(const uint8_t *, char *, size_t);
blob - 8646f35a6980e076df57e4bae034c5be6d66628e (mode 644)
blob + /dev/null
--- lib/got_worktree_priv.h
+++ /dev/null
-/*
- * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-struct got_worktree {
- char *root_path;
- char *repo_path;
- char *path_prefix;
- char *base_commit;
- char *head_ref;
-
- /*
- * File descriptor for the lock file, open while a work tree is open.
- * When a work tree is opened, a shared lock on the lock file is
- * acquired with flock(2). This shared lock is held until the work
- * tree is closed, i.e. throughout the lifetime of any operation
- * which uses a work tree.
- * Before any modifications are made to the on-disk state of work
- * tree meta data, tracked files, or directory tree structure, this
- * shared lock must be upgraded to an exclusive lock.
- */
- int lockfd;
-};
-
-#define GOT_WORKTREE_GOT_DIR ".got"
-#define GOT_WORKTREE_FILE_INDEX "fileindex"
-#define GOT_WORKTREE_REPOSITORY "repository"
-#define GOT_WORKTREE_PATH_PREFIX "path-prefix"
-#define GOT_WORKTREE_BASE_COMMIT "base-commit"
-#define GOT_WORKTREE_HEAD "head"
-#define GOT_WORKTREE_LOCK "lock"
-#define GOT_WORKTREE_FORMAT "format"
-
-#define GOT_WORKTREE_FORMAT_VERSION 1
-#define GOT_WORKTREE_INVALID_COMMIT_ID GOT_SHA1_STRING_ZERO
blob - /dev/null
blob + 8646f35a6980e076df57e4bae034c5be6d66628e (mode 644)
--- /dev/null
+++ lib/got_worktree_lib.h
+/*
+ * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+struct got_worktree {
+ char *root_path;
+ char *repo_path;
+ char *path_prefix;
+ char *base_commit;
+ char *head_ref;
+
+ /*
+ * File descriptor for the lock file, open while a work tree is open.
+ * When a work tree is opened, a shared lock on the lock file is
+ * acquired with flock(2). This shared lock is held until the work
+ * tree is closed, i.e. throughout the lifetime of any operation
+ * which uses a work tree.
+ * Before any modifications are made to the on-disk state of work
+ * tree meta data, tracked files, or directory tree structure, this
+ * shared lock must be upgraded to an exclusive lock.
+ */
+ int lockfd;
+};
+
+#define GOT_WORKTREE_GOT_DIR ".got"
+#define GOT_WORKTREE_FILE_INDEX "fileindex"
+#define GOT_WORKTREE_REPOSITORY "repository"
+#define GOT_WORKTREE_PATH_PREFIX "path-prefix"
+#define GOT_WORKTREE_BASE_COMMIT "base-commit"
+#define GOT_WORKTREE_HEAD "head"
+#define GOT_WORKTREE_LOCK "lock"
+#define GOT_WORKTREE_FORMAT "format"
+
+#define GOT_WORKTREE_FORMAT_VERSION 1
+#define GOT_WORKTREE_INVALID_COMMIT_ID GOT_SHA1_STRING_ZERO
blob - 083cd850bccb87b8f71244429cd970ba60b9ead0 (mode 644)
blob + /dev/null
--- lib/got_zbuf_priv.h
+++ /dev/null
-/*
- * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-struct got_zstream_buf {
- z_stream z;
- char *inbuf;
- size_t inlen;
- char *outbuf;
- size_t outlen;
- int flags;
-#define GOT_ZSTREAM_F_HAVE_MORE 0x01
-};
-
-const struct got_error *got_inflate_init(struct got_zstream_buf *, size_t);
-const struct got_error *got_inflate_read(struct got_zstream_buf *, FILE *,
- size_t *);
-void got_inflate_end(struct got_zstream_buf *);
-const struct got_error *got_inflate_to_mem(uint8_t **, size_t *, FILE *);
-const struct got_error *got_inflate_to_file(size_t *, FILE *, FILE *);
blob - /dev/null
blob + 083cd850bccb87b8f71244429cd970ba60b9ead0 (mode 644)
--- /dev/null
+++ lib/got_zbuf_lib.h
+/*
+ * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+struct got_zstream_buf {
+ z_stream z;
+ char *inbuf;
+ size_t inlen;
+ char *outbuf;
+ size_t outlen;
+ int flags;
+#define GOT_ZSTREAM_F_HAVE_MORE 0x01
+};
+
+const struct got_error *got_inflate_init(struct got_zstream_buf *, size_t);
+const struct got_error *got_inflate_read(struct got_zstream_buf *, FILE *,
+ size_t *);
+void got_inflate_end(struct got_zstream_buf *);
+const struct got_error *got_inflate_to_mem(uint8_t **, size_t *, FILE *);
+const struct got_error *got_inflate_to_file(size_t *, FILE *, FILE *);
blob - 7ad3fb7759ba0aecadda6ae00f5db282079a8911
blob + e7ec8e7d8d8c5b4d680c4939f2a9f8e1512fbe32
--- lib/object.c
+++ lib/object.c
#include "got_object.h"
#include "got_repository.h"
-#include "got_sha1_priv.h"
-#include "got_delta_priv.h"
-#include "got_pack_priv.h"
-#include "got_zbuf_priv.h"
-#include "got_object_priv.h"
+#include "got_sha1_lib.h"
+#include "got_delta_lib.h"
+#include "got_pack_lib.h"
+#include "got_zbuf_lib.h"
+#include "got_object_lib.h"
#ifndef MIN
#define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
blob - a81848627d0d3dd80e1e7f20bd2a0078817e63bf
blob + a10bec55ed58ab61e168b1b4c6314c9e31cf3d00
--- lib/pack.c
+++ lib/pack.c
#include "got_object.h"
#include "got_repository.h"
-#include "got_sha1_priv.h"
-#include "got_pack_priv.h"
-#include "got_path_priv.h"
-#include "got_delta_priv.h"
-#include "got_zbuf_priv.h"
-#include "got_object_priv.h"
-#include "got_repository_priv.h"
+#include "got_sha1_lib.h"
+#include "got_pack_lib.h"
+#include "got_path_lib.h"
+#include "got_delta_lib.h"
+#include "got_zbuf_lib.h"
+#include "got_object_lib.h"
+#include "got_repository_lib.h"
#ifndef nitems
#define nitems(_a) (sizeof(_a) / sizeof((_a)[0]))
blob - d654a23dd0e565d6294ea6fe7e635d4275b4a36a
blob + 021720b277109368e9c0ec2b3f66fafaed364f0e
--- lib/path.c
+++ lib/path.c
#include <stdio.h>
#include <string.h>
-#include "got_path_priv.h"
+#include "got_path_lib.h"
int
got_path_is_absolute(const char *path)
blob - 7ea9289bf339c1c16c8dcb23112bdce4702527ae
blob + 3064e1cfe326c7f47a7e0ab1fbe97b1eb62125c2
--- lib/refs.c
+++ lib/refs.c
#include "got_repository.h"
#include "got_refs.h"
-#include "got_sha1_priv.h"
-#include "got_path_priv.h"
-#include "got_delta_priv.h"
-#include "got_zbuf_priv.h"
-#include "got_object_priv.h"
+#include "got_sha1_lib.h"
+#include "got_path_lib.h"
+#include "got_delta_lib.h"
+#include "got_zbuf_lib.h"
+#include "got_object_lib.h"
/* A symbolic reference. */
struct got_symref {
blob - 1a6fd7b08f4f431dd12a997009a65c6f0bf706f8
blob + 630a646167f300de74854bdd0b0098adaa34938e
--- lib/repository.c
+++ lib/repository.c
#include "got_refs.h"
#include "got_repository.h"
-#include "got_path_priv.h"
-#include "got_repository_priv.h"
-#include "got_zbuf_priv.h"
-#include "got_delta_priv.h"
-#include "got_object_priv.h"
-#include "got_pack_priv.h"
+#include "got_path_lib.h"
+#include "got_repository_lib.h"
+#include "got_zbuf_lib.h"
+#include "got_delta_lib.h"
+#include "got_object_lib.h"
+#include "got_pack_lib.h"
#ifndef nitems
#define nitems(_a) (sizeof(_a) / sizeof((_a)[0]))
blob - b58e4a7aea374d1a31d0750f6eff6bb116e9dfc0
blob + 86810c7968e259e91b0f1ba40cce6ce75a241f7f
--- lib/sha1.c
+++ lib/sha1.c
#include <stdlib.h>
#include <limits.h>
-#include "got_sha1_priv.h"
+#include "got_sha1_lib.h"
static int
parse_xdigit(uint8_t *val, const char *hex)
blob - 1545acde06e4af06f140b6a1ebdb4b1d0a7ae185
blob + a561e0be59a311f3ed05f30a54a081b3c5150a5a
--- lib/worktree.c
+++ lib/worktree.c
#include "got_refs.h"
#include "got_worktree.h"
-#include "got_worktree_priv.h"
-#include "got_path_priv.h"
-#include "got_sha1_priv.h"
+#include "got_worktree_lib.h"
+#include "got_path_lib.h"
+#include "got_sha1_lib.h"
static const struct got_error *
create_meta_file(const char *path_got, const char *name, const char *content)
blob - a7a5db2a6d6f5fc05e1a82976133453c119a03ea
blob + c75207647a9046ebd37a9653eb4955f10606106d
--- lib/zbuf.c
+++ lib/zbuf.c
#include "got_error.h"
#include "got_object.h"
-#include "got_path_priv.h"
-#include "got_zbuf_priv.h"
+#include "got_path_lib.h"
+#include "got_zbuf_lib.h"
const struct got_error *
got_inflate_init(struct got_zstream_buf *zb, size_t bufsize)
blob - b872cd0bbaabfbd1a26752e9dea97b8ced4996f2
blob + f6edbe0c48e2a16e9a972148efe589e563335657
--- regress/delta/delta_test.c
+++ regress/delta/delta_test.c
#include "got_error.h"
-#include "got_delta_priv.h"
-#include "got_path_priv.h"
+#include "got_delta_lib.h"
+#include "got_path_lib.h"
#ifndef nitems
#define nitems(_a) (sizeof(_a) / sizeof((_a)[0]))
blob - 5bacfa8cc12585d35d6d04e64c705ab147e87f6e
blob + 1bde89a4abe6550a5bbfc2ae3171877410b724ab
--- regress/worktree/worktree_test.c
+++ regress/worktree/worktree_test.c
#include "got_repository.h"
#include "got_worktree.h"
-#include "got_worktree_priv.h"
-#include "got_path_priv.h"
+#include "got_worktree_lib.h"
+#include "got_path_lib.h"
#define GOT_REPO_PATH "../../../"
