On Fri, Nov 13, 2015 at 06:14:36AM +0100, Geert Stappers via Syslinux wrote:> On Fri, Nov 13, 2015 at 05:05:26AM +0200, Ady via Syslinux wrote: > > diff U3 syslinux-6.03/extlinux/main.c syslinux-6.03_typo/extlinux/main.c > > --- syslinux-6.03/extlinux/main.c Mon Oct 06 16:27:44 2014 > > +++ syslinux-6.03_typo/extlinux/main.c Fri Nov 13 02:29:56 2015 > > patch seen > > I have scheduled time on saturday 14 november to make it `git am` ready.(I had to reschedule my saturday) It will become two patches, a typo fix patch and white space change patch. Groeten Geert Stappers -- Leven en laten leven
Some typo fixes in extlinux/main.c.
None of them effects code execution.
---
extlinux/main.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/extlinux/main.c b/extlinux/main.c
index 6871fb1..26eb43c 100644
--- a/extlinux/main.c
+++ b/extlinux/main.c
@@ -14,7 +14,7 @@
/*
* extlinux.c
*
- * Install the syslinux boot block on an fat, ntfs, ext2/3/4, btrfs, xfs,
+ * Install the syslinux boot block on a fat, ntfs, ext2/3/4, btrfs, xfs,
* and ufs1/2 filesystem.
*/
@@ -598,9 +598,9 @@ bail:
return 1;
}
-/* btrfs has to install the ldlinux.sys in the first 64K blank area, which
- is not managered by btrfs tree, so actually this is not installed as files.
- since the cow feature of btrfs will move the ldlinux.sys every where */
+/* btrfs has to install ldlinux.sys in the first 64K blank area, which
+ is not managed by btrfs tree, so actually this is not installed as a file,
+ since the cow feature of btrfs would move the ldlinux.sys file everywhere.
*/
int btrfs_install_file(const char *path, int devfd, struct stat *rst)
{
char *file;
@@ -662,7 +662,7 @@ int btrfs_install_file(const char *path, int devfd, struct
stat *rst)
* Due to historical reasons (SGI IRIX's design of disk layouts), the first
* sector in the primary AG on XFS filesystems contains the superblock, which
is
* a problem with bootloaders that rely on BIOSes (that load VBRs which are
- * (located in the first sector of the partition).
+ * located in the first sector of the partition).
*
* Thus, we need to handle this issue, otherwise Syslinux will damage the
XFS's
* superblock.
--
1.7.10.4
On Sun, Nov 15, 2015 at 12:30:35PM +0100, Ady SF via Syslinux wrote:> [PATCH] extlinux/main.c: typo fixes > > Some typo fixes in extlinux/main.c. > None of them effects code execution. > --- > extlinux/main.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) >FWIW working on a new version that is `git am` ready, it will have a "sign-off". (It shoud have allready) And to circumvent the from-rewrite-by-the-ML I'll sent BCCs to Gene, Paulo and Peter. Groeten Geert Stappers -- Leven en laten leven
Spaces, ASCII 0x20, have been
* moved
* inserted
* deleted
Signed-off-by: Geert Stappers <stappers at stappers.nl>
---
extlinux/main.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/extlinux/main.c b/extlinux/main.c
index 26eb43c..ed359f1 100644
--- a/extlinux/main.c
+++ b/extlinux/main.c
@@ -393,11 +393,11 @@ int install_bootblock(int fd, const char *device)
if (sb5.sb_magicnum == *(u32 *)XFS_SB_MAGIC) {
if (be32_to_cpu(sb5.sb_blocksize) != XFS_SUPPORTED_BLOCKSIZE) {
fprintf(stderr,
- "You need to have 4 KiB filesystem block size for "
- " being able to install Syslinux in your XFS "
- "partition (because there is no enough space in MBR to "
- "determine where Syslinux bootsector can be installed "
- "regardless the filesystem block size)\n");
+ "You need to have 4 KiB filesystem block size for"
+ " being able to install Syslinux in your XFS"
+ " partition (because there is not enough space in MBR to"
+ " determine where Syslinux bootsector can be installed"
+ " regardless of the filesystem block size)\n");
return 1;
}
@@ -420,8 +420,8 @@ int install_bootblock(int fd, const char *device)
if (!ok) {
fprintf(stderr,
- "no fat, ntfs, ext2/3/4, btrfs, xfs "
- "or ufs1/2 superblock found on %s\n",
+ "no fat, ntfs, ext2/3/4, btrfs, xfs"
+ " or ufs1/2 superblock found on %s\n",
device);
return 1;
}
@@ -751,7 +751,7 @@ bail:
* * test if path is a subvolume:
* * this function return
* * 0-> path exists but it is not a subvolume
- * * 1-> path exists and it is a subvolume
+ * * 1-> path exists and it is a subvolume
* * -1 -> path is unaccessible
* */
static int test_issubvolume(char *path)
@@ -1385,8 +1385,8 @@ static int open_device(const char *path, struct stat *st,
char **_devname)
if (!fs_type) {
fprintf(stderr,
- "%s: not a fat, ntfs, ext2/3/4, btrfs, xfs or"
- "ufs1/2 filesystem: %s\n",
+ "%s: not a fat, ntfs, ext2/3/4, btrfs, xfs"
+ " or ufs1/2 filesystem: %s\n",
program, path);
return -1;
}
--
1.7.10.4
On Sun, Nov 15, 2015 at 7:53 AM, Ady SF <ady-sf at hotmail.com> wrote:> Spaces, ASCII 0x20, have been > * moved > * inserted > * deleted > > Signed-off-by: Geert Stappers <stappers at stappers.nl> > --- > extlinux/main.c | 20 ++++++++++---------- > 1 file changed, 10 insertions(+), 10 deletions(-)Merged. Thanks Ady and Geert. -- -Gene