Fix eread to not accept invalid input for file selection. (Bug #189994)

svn path=/; revision=436

diff --git a/trunk/ChangeLog b/trunk/ChangeLog
index 4c939be9091bff12ac463d29d98a028b3bb6167f..105cdb6695054d3d249f2952e3db9bab31d0d06e 100644 (file)
--- a/trunk/ChangeLog
+++ b/trunk/ChangeLog
@@ -3,6 +3,8 @@
        #192345)
        * revdep-rebuild: Correctly handle the case where an ebuild no longer
        exists for a package (Bug #188918)
+       * eread: Fix eread to not accept invalid input for file selection.
+       (Bug #189994)
 
 2007-08-08: Paul Varner <fuzzyray@gentoo.org>
        * revdep-rebuild: Fix progress bar to only update when there is a

diff --git a/trunk/src/eread/eread b/trunk/src/eread/eread
index 20974604c61ac445c09fb109d063c1cd06a9a8f1..c6d4de13f5d11afbee0b7de8f71ae8aff246e5f4 100755 (executable)
--- a/trunk/src/eread/eread
+++ b/trunk/src/eread/eread
@@ -49,31 +49,36 @@ select_loop() {
                                break
                                ;;
                        *)
-                               ${PAGER} ${FILE}
-                               read -p "Delete file? [y/N] " DELETE
-                               case ${DELETE} in
-                                       q)
-                                               echo "Quitting"
-                                               QUIT="yes"
-                                               break
-                                               ;;
-                                       y|Y)
-                                               rm -f ${FILE}
-                                               SUCCESS=$?
-                                               if [[ ${SUCCESS} = 0 ]]; then
-                                                       echo "Deleted ${FILE}"
-                                               else
-                                                       echo "Unable to delete ${FILE}"
-                                               fi
-                                               ;;
-                                       # Empty string defaults to N (save file)
-                                       n|N|"")
-                                               echo "Saving ${FILE}"
-                                               ;;
-                                       *)
-                                               echo "Invalid response. Saving ${FILE}"
-                                               ;;
-                               esac
+                               if [ -f "$FILE" ]; then
+                                       ${PAGER} ${FILE}
+                                       read -p "Delete file? [y/N] " DELETE
+                                       case ${DELETE} in
+                                               q)
+                                                       echo "Quitting"
+                                                       QUIT="yes"
+                                                       break
+                                                       ;;
+                                               y|Y)
+                                                       rm -f ${FILE}
+                                                       SUCCESS=$?
+                                                       if [[ ${SUCCESS} = 0 ]]; then
+                                                               echo "Deleted ${FILE}"
+                                                       else
+                                                               echo "Unable to delete ${FILE}"
+                                                       fi
+                                                       ;;
+                                               # Empty string defaults to N (save file)
+                                               n|N|"")
+                                                       echo "Saving ${FILE}"
+                                                       ;;
+                                               *)
+                                                       echo "Invalid response. Saving ${FILE}"
+                                                       ;;
+                                       esac
+                               else
+                                       echo
+                                       echo "Invalid response."
+                               fi
                                ;;
                esac
                break