Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
aports
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
651
Issues
651
List
Boards
Labels
Service Desk
Milestones
Merge Requests
216
Merge Requests
216
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
alpine
aports
Commits
2728f1bf
Commit
2728f1bf
authored
Jul 09, 2010
by
Natanael Copa
2
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
main/busybox: fix for diff
fixes
#381
parent
b52ed2e8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
1 deletion
+32
-1
main/busybox/APKBUILD
main/busybox/APKBUILD
+3
-1
main/busybox/diff.patch
main/busybox/diff.patch
+29
-0
No files found.
main/busybox/APKBUILD
View file @
2728f1bf
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname
=
busybox
pkgver
=
1.16.2
pkgrel
=
0
pkgrel
=
1
pkgdesc
=
"Size optimized toolbox of many common UNIX utilities"
url
=
http://busybox.net
license
=
"GPL-2"
...
...
@@ -11,6 +11,7 @@ subpackages="$pkgname-static"
triggers
=
"busybox.trigger:/bin /usr/bin /sbin /usr/sbin /lib/modules/*"
source
=
"http://busybox.net/downloads/
$pkgname
-
$pkgver
.tar.bz2
$pkgname
-1.11.1-bb.patch
diff.patch
flock-bb.patch
busyboxconfig"
...
...
@@ -69,5 +70,6 @@ static() {
md5sums
=
"2ba980f720a5bdce4ec05423519acc35 busybox-1.16.2.tar.bz2
4c0f3b486eaa0674961b7ddcd0c60a9b busybox-1.11.1-bb.patch
f2d22840613fc6e3f359c87af9781caa diff.patch
20d9beea7d0c0aaca14553a8f98fee12 flock-bb.patch
4bc85af9dd659cbb83c9a819b3481a47 busyboxconfig"
main/busybox/diff.patch
0 → 100644
View file @
2728f1bf
commit d1ed648727f3a0df2d067d869040306ba1e2c52e
Author: Natanael Copa <natanael.copa@gmail.com>
Date: Fri Jul 9 09:38:03 2010 +0000
diff: strip trailing / on dirs
fixes #2203
https://bugs.busybox.net/show_bug.cgi?id=2203
diff --git a/editors/diff.c b/editors/diff.c
index 07594e8..e2da626 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -788,9 +788,15 @@
static void diffdir(char *p[2], const char *s_start)
memset(&list, 0, sizeof(list));
for (i = 0; i < 2; i++) {
+ char *lc;
/*list[i].s = list[i].e = 0; - memset did it */
/*list[i].dl = NULL; */
+ /* trim trailing / in dirs. */
+ lc = last_char_is(p[i], '/');
+ if (lc && lc != p[i])
+ *lc = '\0';
+
/* We need to trim root directory prefix.
* Using list.len to specify its length,
* add_to_dirlist will remove it. */
Natanael Copa
@ncopa
mentioned in commit
27f84b41
·
Jul 12, 2019
mentioned in commit
27f84b41
mentioned in commit 27f84b4112da5c32629122648c56c7ee9a539884
Toggle commit list
Ted Trask
@ttrask01
mentioned in issue
#381 (closed)
·
Jul 12, 2019
mentioned in issue
#381 (closed)
mentioned in issue #381
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment