-
Notifications
You must be signed in to change notification settings - Fork 25
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[more] implementation #373
Merged
Merged
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
[more] fixed problems
- Loading branch information
commit fe2cbb18ad01cc0d9d7b060a20d430b6ce86aa10
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,8 +2,6 @@ name: Rust | |
|
||
on: | ||
push: | ||
branches: | ||
- more | ||
pull_request: | ||
|
||
env: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,3 @@ | ||
|
||
target/ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,7 +8,7 @@ | |
// | ||
|
||
use clap::Parser; | ||
use gettextrs::{bind_textdomain_codeset, setlocale, textdomain, LocaleCategory}; | ||
use gettextrs::{bind_textdomain_codeset, gettext, setlocale, textdomain, LocaleCategory}; | ||
use libc::{ | ||
getegid, getgid, getuid, regcomp, regex_t, regexec, setgid, setuid, REG_ICASE, REG_NOMATCH, | ||
}; | ||
|
@@ -42,53 +42,83 @@ static NEED_QUIT: Mutex<bool> = Mutex::new(false); | |
#[derive(Parser)] | ||
#[command(version, about = "more - display files on a page-by-page basis")] | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The string constant should be wrapped inside a There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This still needs fixing. |
||
struct Args { | ||
// Enable interactive session test | ||
#[arg(long = "test", help = "Enable interactive session test.")] | ||
test: bool, | ||
|
||
/// Do not scroll, display text and clean line ends | ||
#[arg(short = 'c', help = "Do not scroll, display text and clean line ends.")] | ||
#[arg( | ||
short = 'c', | ||
long = "print-over", | ||
help = gettext("Do not scroll, display text and clean line ends") | ||
)] | ||
print_over: bool, | ||
|
||
/// Exit on end-of-file | ||
#[arg(short = 'e', help = "Exit on end-of-file.")] | ||
#[arg( | ||
short = 'e', | ||
long = "exit-on-eof", | ||
help = gettext("Exit on end-of-file") | ||
)] | ||
exit_on_eof: bool, | ||
|
||
/// Perform pattern matching in searches without regard to case | ||
#[arg( | ||
short = 'i', | ||
help = "Perform pattern matching in searches without regard to case." | ||
long = "ignore-case", | ||
help = gettext("Perform pattern matching in searches without regard to case") | ||
)] | ||
case_insensitive: bool, | ||
jgarzik marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
/// Execute the more command(s) in the command arguments in the order specified | ||
#[arg( | ||
short = 'p', | ||
help = "Execute the more command(s) in the command arguments in the order specified." | ||
long = "execute", | ||
help = gettext("Execute the more command(s) in the command arguments in the order specified") | ||
)] | ||
commands: Option<String>, | ||
|
||
/// Squeeze multiple blank lines into one | ||
#[arg(short = 's', help = "Squeeze multiple blank lines into one.")] | ||
#[arg( | ||
short = 's', | ||
long = "squeeze", | ||
help = gettext("Squeeze multiple blank lines into one") | ||
)] | ||
squeeze: bool, | ||
|
||
/// Write the screenful of the file containing the tag named by the tagstring argument | ||
#[arg( | ||
short = 't', | ||
help = "Write the screenful of the file containing the tag named by the tagstring argument." | ||
long = "tag", | ||
help = gettext("Write the screenful of the file containing the tag named by the tagstring argument") | ||
)] | ||
tag: Option<String>, | ||
|
||
/// Suppress underlining and bold | ||
#[arg(short = 'u', help = "Suppress underlining and bold.")] | ||
#[arg( | ||
short = 'u', | ||
long = "plain", | ||
help = gettext("Suppress underlining and bold") | ||
)] | ||
plain: bool, | ||
|
||
/// The number of lines per screenful | ||
#[arg(short = 'n', help = "The number of lines per screenful.")] | ||
#[arg( | ||
short = 'n', | ||
long = "lines", | ||
help = gettext("The number of lines per screenful") | ||
)] | ||
lines: Option<u16>, | ||
|
||
/// Enable interactive session test | ||
#[arg( | ||
short = 'd', | ||
long = "test", | ||
help = gettext("Enable interactive session test") | ||
)] | ||
test: bool, | ||
|
||
/// A pathnames of an input files | ||
#[arg(name = "FILE", help = "A pathnames of an input files.")] | ||
#[arg( | ||
name = "FILES", | ||
help = gettext("A pathnames of input files") | ||
)] | ||
input_files: Vec<String>, | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This PR should not update .gitignore at all?