Skip to content

df: Correct BLOCKSIZE with -k #1906

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.

Sign up for GitHub

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

Open
ankushT369 wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −4
Open

df: Correct BLOCKSIZE with -k #1906

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions bin/df/df.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,12 @@ main(int argc, char *argv[])
/*
* POSIX specifically discusses the behavior of
* both -k and -P. It states that the blocksize should
* be set to 1024. Thus, if this occurs, simply break
* rather than clobbering the old blocksize.
* be set to 1024.
*/
if (kflag)
if (kflag) {
setenv("BLOCKSIZE", "1024", 1);
break;
}
Copy link
Member

@jlduran jlduran Dec 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this } needs to be indented using 3 horizontal tabulation characters.

Copy link
Author

@ankushT369 ankushT369 Dec 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should i make these changes and squash it here?

Copy link
Member

@jlduran jlduran Dec 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes

Copy link
Author

@ankushT369 ankushT369 Dec 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok final :

  1. Remove this one : Thus, if this occurs, simply break ather than clobbering the old blocksize.
  2. and this } needs to be indented using 3 horizontal tabulation characters.

setenv("BLOCKSIZE", "512", 1);
hflag = 0;
break;
Expand All @@ -154,7 +155,7 @@ main(int argc, char *argv[])
break;
case 'k':
kflag++;
setenv("BLOCKSIZE", "1024", 1);
setenv("BLOCKSIZE", "1k", 1);
hflag = 0;
break;
case 'l':
Expand Down