-///*\r
-// * Default user search path.\r
-// * set by login(1), rshd(8), rexecd(8)\r
-// * used by execvp(3) absent PATH from the environ(7)\r
-// */\r
-//#ifdef RESCUEDIR\r
-//#define _PATH_DEFPATH RESCUEDIR ":/usr/bin:/bin:/usr/pkg/bin:/usr/local/bin"\r
-//#else\r
-//#define _PATH_DEFPATH "/usr/bin:/bin:/usr/pkg/bin:/usr/local/bin"\r
-//#endif\r
-\r
-///*\r
-// * All standard utilities path.\r
-// * set by init(8) for system programs & scripts (e.g. /etc/rc)\r
-// * used by ttyaction(3), whereis(1)\r
-// */\r
-//#define _PATH_STDPATH "/usr/bin:/bin:/usr/sbin:/sbin:/usr/pkg/bin:/usr/pkg/sbin:/usr/local/bin:/usr/local/sbin"\r
-\r
-//#define _PATH_AUDIO "/dev/audio"\r
-//#define _PATH_AUDIO0 "/dev/audio0"\r
-//#define _PATH_AUDIOCTL "/dev/audioctl"\r
-//#define _PATH_AUDIOCTL0 "/dev/audioctl0"\r
-//#define _PATH_BPF "/dev/bpf"\r
-//#define _PATH_CLOCKCTL "/dev/clockctl"\r
-//#define _PATH_CSMAPPER "/usr/share/i18n/csmapper"\r
-//#define _PATH_DEFTAPE "/dev/nrst0"\r
-//#define _PATH_DEVDB "/var/run/dev.db"\r
-//#define _PATH_DRUM "/dev/drum"\r
-//#define _PATH_ESDB "/usr/share/i18n/esdb"\r
-//#define _PATH_FTPUSERS "/etc/ftpusers"\r
-//#define _PATH_I18NMODULE "/usr/lib/i18n"\r
-//#define _PATH_ICONV "/usr/share/i18n/iconv"\r
-//#define _PATH_KMEM "/dev/kmem"\r
-//#define _PATH_KSYMS "/dev/ksyms"\r
-//#define _PATH_KVMDB "/var/db/kvm.db"\r
-//#define _PATH_MAILDIR "/var/mail"\r
-//#define _PATH_MAN "/usr/share/man"\r
-//#define _PATH_MEM "/dev/mem"\r
-//#define _PATH_MIXER "/dev/mixer"\r
-//#define _PATH_MIXER0 "/dev/mixer0"\r
-//#define _PATH_NOLOGIN "/etc/nologin"\r
-//#define _PATH_RANDOM "/dev/random"\r
-//#define _PATH_SENDMAIL "/usr/sbin/sendmail"\r
-//#define _PATH_SHELLS "/etc/shells"\r
-//#define _PATH_SKEYKEYS "/etc/skeykeys"\r
-//#define _PATH_SOUND "/dev/sound"\r
-//#define _PATH_SOUND0 "/dev/sound0"\r
-//#define _PATH_SYSMON "/dev/sysmon"\r
-//#define _PATH_UNIX "/netbsd"\r
-//#define _PATH_URANDOM "/dev/urandom"\r
-//#define _PATH_VI "/usr/bin/vi"\r
+/* Provide trailing slash, since mostly used for building pathnames.\r
+ * see the __CONCAT() macro from <sys/EfiCdefs.h> for cpp examples.\r
+ */\r
+#define _PATH_DEV "/dev/"\r
+#define _PATH_STDLIB "/Efi/StdLib/"\r
+#define _PATH_ETC _PATH_STDLIB "etc/"\r
+#define _PATH_TMP _PATH_STDLIB "tmp/"\r
+#define _PATH_LIB _PATH_STDLIB "lib/"\r
+#define _PATH_BIN "/Efi/Tools/"\r