commit d9f988e7ed82c6b61cd465aba21895d6fe4f9e9b
parent 983babc5f6474597f6e2a8a5d03d9ff17616f269
Author: Arun Prakash Jana <engineerarun@gmail.com>
Date: Sun, 20 Jun 2021 21:25:22 +0530
Fix patch break
Diffstat:
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/patches/gitstatus/mainline.diff b/patches/gitstatus/mainline.diff
@@ -165,7 +165,7 @@ index 67523fe6..c965bd1c 100644
+
+ for (size_t i = 0; i < git_statuses.len; ++i)
+ if (git_statuses.statuses[i].status)
-+ if ((dentp->flags & DIR_OR_LINK_TO_DIR) ? (is_prefix(git_statuses.statuses[i].path, dentpath, namebuflen) &&
++ if ((dentp->flags & DIR_OR_DIRLNK) ? (is_prefix(git_statuses.statuses[i].path, dentpath, namebuflen) &&
+ namebuflen <= xstrlen(git_statuses.statuses[i].path)) : !xstrcmp(git_statuses.statuses[i].path, dentpath)) {
+ if (git_statuses.statuses[i].status != GIT_STATUS_IGNORED)
+ git_statuses.show = TRUE;
diff --git a/patches/gitstatus/namefirst.diff b/patches/gitstatus/namefirst.diff
@@ -166,7 +166,7 @@ index b8b222d4..80ef884f 100644
+
+ for (size_t i = 0; i < git_statuses.len; ++i)
+ if (git_statuses.statuses[i].status)
-+ if ((dentp->flags & DIR_OR_LINK_TO_DIR) ? (is_prefix(git_statuses.statuses[i].path, dentpath, namebuflen) &&
++ if ((dentp->flags & DIR_OR_DIRLNK) ? (is_prefix(git_statuses.statuses[i].path, dentpath, namebuflen) &&
+ namebuflen <= xstrlen(git_statuses.statuses[i].path)) : !xstrcmp(git_statuses.statuses[i].path, dentpath)) {
+ if (git_statuses.statuses[i].status != GIT_STATUS_IGNORED)
+ git_statuses.show = TRUE;
diff --git a/patches/namefirst/mainline.diff b/patches/namefirst/mainline.diff
@@ -130,7 +130,7 @@ index eabe30f0..d8dc5925 100644
+
+ if (attrs)
+ attron(attrs);
-+ if (!g_state.oldcolor && (type == S_IFDIR || (type == S_IFLNK && ent->flags & DIR_OR_LINK_TO_DIR)))
++ if (!g_state.oldcolor && (type == S_IFDIR || (type == S_IFLNK && ent->flags & DIR_OR_DIRLNK)))
+ attroff(A_BOLD);
+ size_t sizelen = (type == S_IFREG || type == S_IFDIR) ? xstrlen(size = coolsize(cfg.blkorder ? ent->blocks << blk_shift : ent->size)) : 1;
+ printw("%*c%*s%s%s", 1 + MIN(namecols, dtls.maxnameln + (size_t)(ind ? 0 : 1)) - namelen, ' ',