s/NTFS-3g/NTFS-3G/g

diff --git a/README b/README
index 70f5a7edc5233fe766ee025447edb6c5dce888ff..3365dcac801ffc4ea18469caf348370f2333eb3d 100644 (file)
--- a/README
+++ b/README
@@ -90,7 +90,7 @@ platform-dependent way:
     Windows-specific data are ordinarily ignored; however, there is also special
     support for capturing and extracting images directly to/from unmounted NTFS
     volumes.  This was made possible with the help of libntfs-3g from the
-    NTFS-3g project.
+    NTFS-3G project.
 
 For both platforms the code for NTFS capture and extraction is complete enough
 that it is possible to apply an image from the "install.wim" contained in recent
@@ -209,7 +209,7 @@ Windows (XP and later).
 As much code as possible is shared among all supported platforms, but there
 necessarily are some differences in what features are supported on each platform
 and how they are implemented.  Most notable is that file tree scanning and
-extraction are implemented separately for Windows, UNIX, and UNIX (NTFS-3g
+extraction are implemented separately for Windows, UNIX, and UNIX (NTFS-3G
 mode), to ensure a fast and feature-rich implementation of each platform/mode.
 
 wimlib is mainly used on x86 and x86_64 CPUs, but it should also work on a
@@ -240,7 +240,7 @@ The algorithms used by wimlib's compression and decompression codecs are
 inspired by a variety of sources, including open source projects and computer
 science papers.
 
-The code in ntfs-3g_apply.c and ntfs-3g_capture.c uses the NTFS-3g library,
+The code in ntfs-3g_apply.c and ntfs-3g_capture.c uses the NTFS-3G library,
 which is a library for reading and writing to NTFS filesystems (the filesystem
 used by recent versions of Windows).  See
 http://www.tuxera.com/community/ntfs-3g-download/ for more information.

diff --git a/configure.ac b/configure.ac
index 3b3b28472269896f28631c94674b85ea42556df5..18a2aa77f0a7b007d184fca1005dfd9f20c0ed19 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -138,7 +138,7 @@ if test "$WITH_NTFS_3G" = "yes"; then
                 libntfs-3g, or configure --without-ntfs-3g to disable this
                 feature.])])
        PKGCONFIG_PRIVATE_REQUIRES="$PKGCONFIG_PRIVATE_REQUIRES libntfs-3g"
-       AC_DEFINE([WITH_NTFS_3G], [1], [Define to 1 if using NTFS-3g support])
+       AC_DEFINE([WITH_NTFS_3G], [1], [Define to 1 if using NTFS-3G support])
 fi
 AM_CONDITIONAL([WITH_NTFS_3G], [test "$WITH_NTFS_3G" = "yes"])
 

diff --git a/doc/man1/wimlib-imagex-apply.1 b/doc/man1/wimlib-imagex-apply.1
index 1245b7ba4865f93c23293fffc705078d64af459e..a512c061303f44735fc571926c82c6ab87d6408a 100644 (file)
--- a/doc/man1/wimlib-imagex-apply.1
+++ b/doc/man1/wimlib-imagex-apply.1
@@ -456,7 +456,7 @@ wimlib-imagex apply install.wim 1 /dev/sda2
 .PP
 Note that before running either of the above commands, an NTFS filesystem may
 need to be created on the partition, for example with format.exe on Windows or
-\fBmkntfs\fR(8) (part of NTFS-3g) on UNIX-like systems.  For example, you might
+\fBmkntfs\fR(8) (part of NTFS-3G) on UNIX-like systems.  For example, you might
 run:
 .RS
 .PP

diff --git a/include/wimlib/case.h b/include/wimlib/case.h
index c55fd0d47cb33c8fbd11c593a26b1efb877b0796..73bef7917bfee02304f7eb0a5e78ed51377a68d9 100644 (file)
--- a/include/wimlib/case.h
+++ b/include/wimlib/case.h
@@ -3,7 +3,7 @@
 
 #include <stdbool.h>
 
-/* Note: the NTFS-3g headers define CASE_SENSITIVE, hence the WIMLIB prefix.  */
+/* Note: the NTFS-3G headers define CASE_SENSITIVE, hence the WIMLIB prefix.  */
 typedef enum {
        /* Use either case-sensitive or case-insensitive search, depending on
         * the variable @default_ignore_case.  */

diff --git a/include/wimlib/dentry.h b/include/wimlib/dentry.h
index b5771b63f69ed9e19addac8d1b53ea85e5ca9146..fc745d5df9d663b3762a63e296347999762e2cd5 100644 (file)
--- a/include/wimlib/dentry.h
+++ b/include/wimlib/dentry.h
@@ -77,7 +77,7 @@ struct wim_dentry {
         * excluding the terminating null  */
        u16 d_extraction_name_nchars;
 
-       /* When capturing from an NTFS volume using NTFS-3g, this flag is set on
+       /* When capturing from an NTFS volume using NTFS-3G, this flag is set on
         * dentries that were created from a filename in the WIN32 or WIN32+DOS
         * namespaces rather than the POSIX namespace.  Otherwise this will
         * always be 0.  */

diff --git a/include/wimlib/inode.h b/include/wimlib/inode.h
index ed6f9de92ee1ea088e1052c3b5f6c78a0b0681dd..b6203fb5b6a3c7698d32730e89f184cf94b87183 100644 (file)
--- a/include/wimlib/inode.h
+++ b/include/wimlib/inode.h
@@ -191,7 +191,7 @@ struct wim_inode {
                        struct wim_dentry *i_first_extraction_alias;
 
                #ifdef WITH_NTFS_3G
-                       /* In NTFS-3g extraction mode, this is set to the Master
+                       /* In NTFS-3G extraction mode, this is set to the Master
                         * File Table (MFT) number of the NTFS file that was
                         * created for this inode.  */
                        u64 i_mft_no;

diff --git a/src/error.c b/src/error.c
index a6b2d3892dc55edaf26915d30cf48b5b46efc285..f427c82c996118a88156ccd248421db8bc08c6b8 100644 (file)
--- a/src/error.c
+++ b/src/error.c
@@ -263,7 +263,7 @@ static const tchar * const error_strings[] = {
                = T("The WIM was not captured such that it can be "
                    "applied from a pipe"),
        [WIMLIB_ERR_NTFS_3G]
-               = T("NTFS-3g encountered an error (check errno)"),
+               = T("NTFS-3G encountered an error (check errno)"),
        [WIMLIB_ERR_OPEN]
                = T("Failed to open a file"),
        [WIMLIB_ERR_OPENDIR]

diff --git a/src/extract.c b/src/extract.c
index 65f93338841563593a30b148a747118c11967377..769abbe15235551b9d93a4f5647d0b66b133024d 100644 (file)
--- a/src/extract.c
+++ b/src/extract.c
@@ -28,7 +28,7 @@
  * wimlib_extract_pathlist().  Internally, all end up calling
  * do_wimlib_extract_paths() and extract_trees().
  *
- * Although wimlib supports multiple extraction modes/backends (NTFS-3g, UNIX,
+ * Although wimlib supports multiple extraction modes/backends (NTFS-3G, UNIX,
  * Win32), this file does not itself have code to extract files or directories
  * to any specific target; instead, it handles generic functionality and relies
  * on lower-level callback functions declared in `struct apply_operations' to do
@@ -1542,7 +1542,7 @@ check_extract_flags(const WIMStruct *wim, int *extract_flags_p)
 
 #ifndef WITH_NTFS_3G
        if (extract_flags & WIMLIB_EXTRACT_FLAG_NTFS) {
-               ERROR("wimlib was compiled without support for NTFS-3g, so\n"
+               ERROR("wimlib was compiled without support for NTFS-3G, so\n"
                      "        it cannot apply a WIM image directly to an NTFS volume.");
                return WIMLIB_ERR_UNSUPPORTED;
        }

diff --git a/src/ntfs-3g_apply.c b/src/ntfs-3g_apply.c
index 9f04dbea5b65b6180c0612461fa4a9099ce2deda..b90d64596c428f6f83b2bf0a89efdafab2ec1227 100644 (file)
--- a/src/ntfs-3g_apply.c
+++ b/src/ntfs-3g_apply.c
@@ -5,7 +5,7 @@
  * much information as possible, including security data, file attributes, DOS
  * names, alternate data streams, and object IDs.
  *
- * Note: because NTFS-3g offers inode-based interfaces, we actually don't need
+ * Note: because NTFS-3G offers inode-based interfaces, we actually don't need
  * to deal with paths at all!  (Other than for error messages.)
  */
 
@@ -302,7 +302,7 @@ ntfs_3g_restore_dos_name(ntfs_inode *ni, ntfs_inode *dir_ni,
                goto out_close;
        }
 
-       /* Unlike most other NTFS-3g functions, ntfs_set_ntfs_dos_name()
+       /* Unlike most other NTFS-3G functions, ntfs_set_ntfs_dos_name()
         * changes the directory's last modification timestamp...
         * Change it back.  */
        return ntfs_3g_restore_timestamps(vol, dentry->d_parent->d_inode);
@@ -1015,7 +1015,7 @@ ntfs_3g_extract(struct list_head *dentry_list, struct apply_ctx *_ctx)
        struct wim_dentry *root;
        int ret;
 
-       /* For NTFS-3g extraction mode we require that the dentries to extract
+       /* For NTFS-3G extraction mode we require that the dentries to extract
         * form a single tree.  */
        root = list_first_entry(dentry_list, struct wim_dentry,
                                d_extraction_list_node);
@@ -1023,7 +1023,7 @@ ntfs_3g_extract(struct list_head *dentry_list, struct apply_ctx *_ctx)
        /* Mount the NTFS volume.  */
        vol = ntfs_mount(ctx->common.target, 0);
        if (!vol) {
-               ERROR_WITH_ERRNO("Failed to mount \"%s\" with NTFS-3g",
+               ERROR_WITH_ERRNO("Failed to mount \"%s\" with NTFS-3G",
                                 ctx->common.target);
                return WIMLIB_ERR_NTFS_3G;
        }
@@ -1064,7 +1064,7 @@ ntfs_3g_extract(struct list_head *dentry_list, struct apply_ctx *_ctx)
 
 out_unmount:
        if (ntfs_umount(ctx->vol, FALSE) && !ret) {
-               ERROR_WITH_ERRNO("Failed to unmount \"%s\" with NTFS-3g",
+               ERROR_WITH_ERRNO("Failed to unmount \"%s\" with NTFS-3G",
                                 ctx->common.target);
                ret = WIMLIB_ERR_NTFS_3G;
        }
@@ -1072,7 +1072,7 @@ out_unmount:
 }
 
 const struct apply_operations ntfs_3g_apply_ops = {
-       .name                   = "NTFS-3g",
+       .name                   = "NTFS-3G",
        .get_supported_features = ntfs_3g_get_supported_features,
        .extract                = ntfs_3g_extract,
        .context_size           = sizeof(struct ntfs_3g_apply_ctx),

diff --git a/src/ntfs-3g_capture.c b/src/ntfs-3g_capture.c
index 9d973a23439d4915c8b205439c094d767df9c116..8408a461f01fb9604437ea3a537f4c4145ec173b 100644 (file)
--- a/src/ntfs-3g_capture.c
+++ b/src/ntfs-3g_capture.c
@@ -50,10 +50,10 @@
 #include "wimlib/scan.h"
 #include "wimlib/security.h"
 
-/* NTFS-3g 2013 renamed MS_RDONLY to NTFS_MNT_RDONLY.  We can't check for the
+/* NTFS-3G 2013 renamed MS_RDONLY to NTFS_MNT_RDONLY.  We can't check for the
  * existence of NTFS_MNT_RDONLY at compilation time because it's an enum.  We
  * also can't check for MS_RDONLY being missing because it's also a system
- * constant.  So check if the NTFS-3g specific MS_IGNORE_HIBERFILE is defined;
+ * constant.  So check if the NTFS-3G specific MS_IGNORE_HIBERFILE is defined;
  * if yes, then we need to use the old MS_RDONLY.  */
 #ifdef MS_IGNORE_HIBERFILE
 #  define NTFS_MNT_RDONLY MS_RDONLY
@@ -271,7 +271,7 @@ set_attr_sort_key(ntfs_inode *ni, struct ntfs_location *loc)
 /*
  * Add a new stream to the specified inode, with duplicate checking.
  *
- * This works around a problem where NTFS-3g can list multiple unnamed data
+ * This works around a problem where NTFS-3G can list multiple unnamed data
  * streams for a single file.  In this case we can only keep one.  We'll prefer
  * one that is nonempty.
  */
@@ -753,7 +753,7 @@ ntfs_3g_build_dentry_tree_recursive(struct wim_dentry **root_ret,
        if (unlikely(attributes & FILE_ATTRIBUTE_ENCRYPTED)) {
                if (params->add_flags & WIMLIB_ADD_FLAG_NO_UNSUPPORTED_EXCLUDE)
                {
-                       ERROR("Can't archive \"%s\" because NTFS-3g capture mode "
+                       ERROR("Can't archive \"%s\" because NTFS-3G capture mode "
                              "does not support encrypted files and directories", path);
                        ret = WIMLIB_ERR_UNSUPPORTED_FILE;
                        goto out;
@@ -812,7 +812,7 @@ ntfs_3g_build_dentry_tree_recursive(struct wim_dentry **root_ret,
        if (ret)
                goto out;
 
-       /* Reparse-point fixups are a no-op because in NTFS-3g capture mode we
+       /* Reparse-point fixups are a no-op because in NTFS-3G capture mode we
         * only allow capturing an entire volume. */
        if (params->add_flags & WIMLIB_ADD_FLAG_RPFIX &&
            inode_is_symlink(inode))

diff --git a/src/tagged_items.c b/src/tagged_items.c
index 85bcadfdf38274e7e346fe9c04285877ed2bd7c8..a851cfd64058604cbb81e2c90ccc2851a042cbd6 100644 (file)
--- a/src/tagged_items.c
+++ b/src/tagged_items.c
@@ -52,7 +52,7 @@ struct tagged_item_header {
        u8 data[];
 };
 
-/* Unconfirmed: are all 64 bytes of the object ID always present?  Since NTFS-3g
+/* Unconfirmed: are all 64 bytes of the object ID always present?  Since NTFS-3G
  * permits shorter object IDs, we'll do the same for now.  */
 #define OBJECT_ID_MIN_LENGTH   16
 

diff --git a/src/update_image.c b/src/update_image.c
index 8551b5f639200cbac21cf3b9ca0080909ef85f23..fb5356338b7e174dfbc578b16c671c236ff75724 100644 (file)
--- a/src/update_image.c
+++ b/src/update_image.c
@@ -1213,7 +1213,7 @@ check_add_command(struct wimlib_update_command *cmd,
 
 #ifndef WITH_NTFS_3G
        if (add_flags & WIMLIB_ADD_FLAG_NTFS) {
-               ERROR("NTFS-3g capture mode is unsupported because wimlib "
+               ERROR("NTFS-3G capture mode is unsupported because wimlib "
                      "was compiled --without-ntfs-3g");
                return WIMLIB_ERR_UNSUPPORTED;
        }

diff --git a/tests/tree-cmp.c b/tests/tree-cmp.c
index b21309541924f6161218f49cedde2641f0e3189a..b6051ccb90f5df99b7a8154dea636e281e74d6ab 100644 (file)
--- a/tests/tree-cmp.c
+++ b/tests/tree-cmp.c
@@ -4,7 +4,7 @@
  * There are two modes:
  *     - Normal mode for any filesystems.  We compare file names, contents,
  *     sizes, modes, access times, and hard links.
- *     - NTFS mode for NTFS-3g mounted volumes.  In this mode we need to
+ *     - NTFS mode for NTFS-3G mounted volumes.  In this mode we need to
  *       compare various NTFS-specific attributes such as named data streams
  *       and DOS names.
  *