Commits

pol...@gnu.org  committed 447c909

Various minor fixes; two patches from Julien Louis <ptitlouis@sysif.net>

  • Participants
  • Parent commits e3e6810

Comments (0)

Files changed (4)

+Julien Louis <ptitlouis@sysif.net>: small fixes.
+
 -----------------------------------------------------------------------------
 
 This file is part of GNU fdisk

File scripts/tarball_upload.sh

 		rm $DIRECTIVE 
 	done
 
+    echo "(Waiting for some time to please GNU upload script...)"
+    sleep 1m
 	#kill $GPGAPID
-done
+done # //compression types
 
 message "! Ready! Hit <RETURN> to start upload."
 read

File src/Makefile.am

 endif MAKE_CFDISK
 
 install-exec-local:
-	@SYMLINK@ @SYMLINKFROM@ $(sbindir)/lfdisk
-	@SYMLINK@ @SYMLINKFROM@ $(sbindir)/gfdisk
+	@SYMLINK@ @SYMLINKFROM@ $(DESTDIR)/$(sbindir)/lfdisk
+	@SYMLINK@ @SYMLINKFROM@ $(DESTDIR)/$(sbindir)/gfdisk
 
 install-exec-am: install-sbinPROGRAMS install-exec-local

File src/cfdisk.c

 #define KEY_DOWN 2
 #define KEY_LEFT 3
 #define KEY_RIGHT 4
+#define KEY_BACKSPACE '\b'
+#define KEY_DC '\177'
 #endif
 
 #include <ctype.h>
 #define TAB	'\011'	/* ^I */
 #define CR	'\015'	/* ^M */
 #define ESC	'\033'	/* ^[ */
-#define DEL	'\177'
 #define CTRL_L	'\014'	/* ^L */
 #define CTRL_P	'\020'	/* ^P */
 #define CTRL_N	'\016'	/* ^N */
 #define CTRL_R	'\022'	/* ^R */
-#define DEL	'\177'
-#define BKSP 	'\b'
 
 
 #define MENUSIZE 3
 			return 0;
 #endif
 		}
-		else if (key == BKSP || key == DEL) {
+		else if (key == KEY_BACKSPACE || key == KEY_DC) {
 			if (i > 0) {
 				buf[--i] = '\0';
 				mvaddch(y,--x,' ');