Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
See what's new at GitLab
4
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Switch to GitLab Next
Sign in / Register
Toggle navigation
P
pager-rs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
6
Issues
6
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Cyril Plisko
pager-rs
Commits
5a3d95aa
Commit
5a3d95aa
authored
Nov 03, 2016
by
Cyril Plisko
🤔
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support pager command with whitespaces
Closes
#3
parent
04ae203f
Pipeline
#4859951
failed with stage
in 4 minutes and 16 seconds
Changes
2
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
4 deletions
+11
-4
src/lib.rs
src/lib.rs
+1
-1
src/utils.rs
src/utils.rs
+10
-3
No files found.
src/lib.rs
View file @
5a3d95aa
...
...
@@ -97,7 +97,7 @@ impl Pager {
// I am parent
utils
::
dup2
(
pager_stdin
,
libc
::
STDIN_FILENO
);
utils
::
close
(
main_stdout
);
utils
::
execvp
(
vec!
[
pager
]
);
utils
::
execvp
(
pager
);
}
}
}
...
...
src/utils.rs
View file @
5a3d95aa
...
...
@@ -9,15 +9,22 @@ fn osstring2cstring(s: &OsString) -> CString {
unsafe
{
CString
::
from_vec_unchecked
(
s
.clone
()
.into_vec
())
}
}
fn
split_string
(
s
:
&
OsString
)
->
Vec
<
OsString
>
{
match
s
.clone
()
.into_string
()
{
Ok
(
cmd
)
=>
cmd
.split_whitespace
()
.map
(
OsString
::
from
)
.collect
(),
Err
(
cmd
)
=>
vec!
[
cmd
],
}
}
// Helper wrappers around libc::* API
pub
fn
fork
()
->
libc
::
pid_t
{
unsafe
{
libc
::
fork
()
}
}
pub
fn
execvp
(
argv
:
Vec
<&
OsString
>
)
{
pub
fn
execvp
(
cmd
:
&
OsString
)
{
let
mut
args
=
Vec
::
with_capacity
(
2
);
for
arg
in
&
argv
{
args
.push
(
osstring2cstring
(
arg
)
.as_ptr
());
for
arg
in
split_string
(
cmd
)
{
args
.push
(
osstring2cstring
(
&
arg
)
.as_ptr
())
}
args
.push
(
ptr
::
null
());
assert
!
(
unsafe
{
libc
::
execvp
(
args
[
0
],
args
.as_ptr
())
}
>
-
1
);
...
...
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