Page MenuHomeFreeBSD
Differential D18663

Collapse $HOME into "~" in PS1.
ClosedPublic
Actions

Authored by trasz on Dec 27 2018, 2:57 PM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Apr 25, 5:14 AM
Unknown Object (File)
Fri, Apr 25, 1:05 AM
Unknown Object (File)
Sat, Apr 19, 9:20 AM
Unknown Object (File)
Sat, Apr 19, 8:29 AM
Unknown Object (File)
Sat, Apr 19, 5:58 AM
Unknown Object (File)
Sat, Apr 19, 5:30 AM
Unknown Object (File)
Sat, Apr 19, 5:14 AM
Unknown Object (File)
Feb 22 2025, 8:29 AM
View All 50 Files
Subscribers
imp

Details

Reviewers
jilles
Commits
rS342577: Make sh(1) collapse $HOME into "~" in PS1.
Summary

Make sh(1) collapse $HOME into "~" in PS1.

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

trasz created this revision.Dec 27 2018, 2:57 PM
Herald added a reviewer: jilles. · View Herald TranscriptDec 27 2018, 2:57 PM
Herald added a subscriber: imp. · View Herald Transcript
Harbormaster completed remote builds in B21739: Diff 52339.Dec 27 2018, 2:57 PM
jilles requested changes to this revision.Dec 27 2018, 3:07 PM
jilles added inline comments.
bin/sh/parser.c
2045–2046 ↗(On Diff #52339)

A path /home/user1 will match /home/user here.

Also, if HOME is /, results will be strange and the substitution should probably be disabled.

2049–2051 ↗(On Diff #52339)

The buffer length passed to strlcpy seems one byte too long.

Also, is it valid to calculate &ps[i + 1]?

This revision now requires changes to proceed.Dec 27 2018, 3:07 PM
trasz updated this revision to Diff 52340.Dec 27 2018, 4:46 PM

Fix things.

Harbormaster completed remote builds in B21740: Diff 52340.Dec 27 2018, 4:46 PM
trasz marked an inline comment as done.Dec 27 2018, 4:47 PM
trasz added inline comments.
bin/sh/parser.c
2049–2051 ↗(On Diff #52339)

Hm, I'm not much of a C lawyer, but I've used that syntax since... ever. What's wrong with it?

jilles accepted this revision.Dec 28 2018, 1:16 PM
jilles added inline comments.
bin/sh/parser.c
2049–2051 ↗(On Diff #52339)

The syntax is fine, but I wondered whether ps[i + 1] is always within bounds. It turns out that it is because the i < PROMPTLEN - 1 check above.

This revision is now accepted and ready to land.Dec 28 2018, 1:16 PM
Closed by commit rS342577: Make sh(1) collapse $HOME into "~" in PS1. (authored by trasz). · Explain WhyDec 28 2018, 5:51 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
head/
bin/
sh/
22 lines

Diff 52374

View Options

head/bin/sh/parser.c

Loading...