populate-volatile.sh: normalize repeated leading slashes in TNAME

PATCH Superseded Jonathan Liu 2 participants 5 messages May 20, 2013

lore

Share & tools

lore

Jonathan Liu

author

2013-05-20 01:34 UTC #0 lore raw

PATCH 1/1 populate-volatile.sh: normalize repeated leading slashes in TNAME

Signed-off-by Jonathan Liu <[email protected]>

---
 meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh +1 -1

index ab09231..bbc1f35 100755
@@ -150,7 +150,7 @@ apply_cfgfile() {
 	cat ${CFGFILE} | grep -v "^#" | \
 		while read LINE; do
 		eval `echo "$LINE" | sed -n "s/\(.*\)\ \(.*\) \(.*\)\ \(.*\)\ \(.*\)\ \(.*\)/TTYPE=\1 ; TUSER=\2; TGROUP=\3; TMODE=\4; TNAME=\5 TLTARGET=\6/p"`
-		TNAME=${ROOT_DIR}/${TNAME}
+		TNAME=`echo ${ROOT_DIR}/${TNAME} | sed -e 's@^//*@/@'`
 		[ "${VERBOSE}" != "no" ] && echo "Checking for -${TNAME}-."
 
 		[ "${TTYPE}" = "l" ] && {

Signature · 1 line

1.8.2.3

Phil Blundell

2013-05-20 09:37 UTC #1 lore raw

meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh apply_cfgfile() { · line 153

Quoted 2 lines · Jonathan Liu

meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh +1 -1
-		TNAME=${ROOT_DIR}/${TNAME}
+		TNAME=`echo ${ROOT_DIR}/${TNAME} | sed -e 's@^//*@/@'`

Why is this a good thing? Your commit message is rather terse.

Jonathan Liu

author

2013-05-20 09:46 UTC #2 lore raw

Quoted 6 lines · Phil Blundell

meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh apply_cfgfile() { · line 153
Quoted 2 lines · Jonathan Liu
meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh +1 -1
-		TNAME=${ROOT_DIR}/${TNAME}
+		TNAME=`echo ${ROOT_DIR}/${TNAME} | sed -e 's@^//*@/@'`
Why is this a good thing? Your commit message is rather terse.
p.

It reduces the size of /etc/volatile.cache.
Otherwise for example if you have ROOT_DIR=/, TNAME=/var/log, TNAME becomes ///var/log. Also if you have verbose mode enabled it actually prints out the extra unnecessary leading slashes.

Regards,
Jonathan

Phil Blundell

2013-05-20 09:56 UTC #3 lore raw

Quoted 6 lines · Jonathan Liu

Quoted 5 lines · Phil Blundell
meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh apply_cfgfile() { · line 153
Quoted 2 lines · Jonathan Liu
meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh +1 -1
-		TNAME=${ROOT_DIR}/${TNAME}
+		TNAME=`echo ${ROOT_DIR}/${TNAME} | sed -e 's@^//*@/@'`
Why is this a good thing? Your commit message is rather terse.

Quoted 7 lines

Quoted 1 line
p.
It reduces the size of /etc/volatile.cache.
Otherwise for example if you have ROOT_DIR=/, TNAME=/var/log, TNAME becomes ///var/log.
Also if you have verbose mode enabled it actually prints out the extra unnecessary leading slashes.

How many bytes does it actually save on a typical system? Is this worth the overhead of forking an extra 2 processes for every line in the file?

Would it not be better fixed by requiring TNAME to start with a slash (which it probably does already), ROOT_DIR to not end with a slash, and just dropping the intermediate separator?

Jonathan Liu

author

2013-05-20 10:23 UTC #4 lore raw

Quoted 18 lines · Phil Blundell

Quoted 6 lines · Jonathan Liu
Quoted 5 lines · Phil Blundell
meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh apply_cfgfile() { · line 153
Quoted 2 lines · Jonathan Liu
meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh +1 -1
-		TNAME=${ROOT_DIR}/${TNAME}
+		TNAME=`echo ${ROOT_DIR}/${TNAME} | sed -e 's@^//*@/@'`
Why is this a good thing? Your commit message is rather terse.
Quoted 7 lines
Quoted 1 line
p.
It reduces the size of /etc/volatile.cache.
Otherwise for example if you have ROOT_DIR=/, TNAME=/var/log, TNAME becomes ///var/log.
Also if you have verbose mode enabled it actually prints out the extra unnecessary leading slashes.
How many bytes does it actually save on a typical system? Is this worth the overhead of forking an extra 2 processes for every line in the file?

Quoted 5 lines

Would it not be better fixed by requiring TNAME to start with a slash (which it probably does already), ROOT_DIR to not end with a slash, and just dropping the intermediate separator?
p.

That does sound like a better solution, let's go with that.

Regards,
Jonathan