svn commit: r209296 - user/ae/usr.sbin/sade

[Andrey V. Elsukov]

Author: ae
Date: Fri Jun 18 11:18:03 2010
New Revision: 209296
URL: http://svn.freebsd.org/changeset/base/209296

Log:
  Save ufsid in UFS's private structure.
  Some style fixes.

Modified:
  user/ae/usr.sbin/sade/fs.c
  user/ae/usr.sbin/sade/fsed.c
  user/ae/usr.sbin/sade/libsade.h

Modified: user/ae/usr.sbin/sade/fs.c
==============================================================================
--- user/ae/usr.sbin/sade/fs.c	Fri Jun 18 11:10:39 2010	(r209295)
+++ user/ae/usr.sbin/sade/fs.c	Fri Jun 18 11:18:03 2010	(r209296)
@@ -242,6 +242,8 @@ de_ufs_check(const char *pname, void **p
 			if (pu != NULL) {
 				bzero(pu, sizeof(*pu));
 				pfs = &disk.d_fs;
+				pu->de_id[0] = pfs->fs_id[0];
+				pu->de_id[1] = pfs->fs_id[1];
 				pu->de_ufs1 = (disk.d_ufs == 1);
 				pu->de_su = ((pfs->fs_flags & FS_DOSOFTDEP) != 0);
 				pu->de_suj = ((pfs->fs_flags & FS_SUJ) != 0);

Modified: user/ae/usr.sbin/sade/fsed.c
==============================================================================
--- user/ae/usr.sbin/sade/fsed.c	Fri Jun 18 11:10:39 2010	(r209295)
+++ user/ae/usr.sbin/sade/fsed.c	Fri Jun 18 11:18:03 2010	(r209296)
@@ -349,7 +349,8 @@ fsed_ufs_mountops(struct de_fs *pfs)
 
 	labels = de_dev_aliases_get(pfs->de_partname);
 	assert(labels != NULL);
-	for (cnt = 0; labels[cnt]; cnt++);
+	for (cnt = 0; labels[cnt]; cnt++)
+		;
 	/* If FS is not yet in fstab and it has a volname, we can
 	 * suggest use volname by default.
 	 */
@@ -382,15 +383,15 @@ fsed_ufs_mountops(struct de_fs *pfs)
 		getmntopts(pfs->de_mntops, mopts, &mntflags, 0);
 	for (i = 0; i < MNT_OPS_CNT - 1; i++) {
 		cOps[i] = dlg_add_checkbox(&dlg, 8 + i % (MNT_OPS_CNT / 3),
-				2 + 16 * (i / 3), 14, 1,
-				(mntflags & mntopt_names[i].o_opt) != 0,
-				mntopt_names[i].o_name);
+		    2 + 16 * (i / 3), 14, 1,
+		    (mntflags & mntopt_names[i].o_opt) != 0,
+		    mntopt_names[i].o_name);
 	}
+	/* Last option is "noauto". Actually it hasn't special MNT_XXX flag. */
 	cOps[i] = dlg_add_checkbox(&dlg, 8 + i % (MNT_OPS_CNT / 3),
-			2 + 16 * (i / 3), 14, 1,
-			(pfs->de_mntops != NULL) ?  strstr(pfs->de_mntops,
-			    mntopt_names[i].o_name) != NULL: 0,
-			mntopt_names[i].o_name);
+	    2 + 16 * (i / 3), 14, 1,
+	    (pfs->de_mntops != NULL) ?  strstr(pfs->de_mntops,
+		mntopt_names[i].o_name) != NULL: 0, mntopt_names[i].o_name);
 
 	btnOk = dlg_add_button(&dlg, 12, 24, "  Ok  ");
 	btnCancel = dlg_add_button(&dlg, 12, 36, "Cancel");
@@ -428,8 +429,8 @@ fsed_ufs_mountops(struct de_fs *pfs)
 			if (item == cLabel) {
 				if (dlg_checkbox_checked(&dlg, item)) {
 					WINDOW *sw;
-					dlg_init(&popup);
 					sw = savescr();
+					dlg_init(&popup);
 					dlg_open_popupmenu(&popup, dlg.y + 8,
 					    dlg.x + 18, 48,
 					    cnt > 5 ? 7: cnt + 1,

Modified: user/ae/usr.sbin/sade/libsade.h
==============================================================================
--- user/ae/usr.sbin/sade/libsade.h	Fri Jun 18 11:10:39 2010	(r209295)
+++ user/ae/usr.sbin/sade/libsade.h	Fri Jun 18 11:18:03 2010	(r209296)
@@ -101,6 +101,9 @@ struct de_fs {
 
 struct de_ufs_priv {
 	char			de_volname[MAXVOLLEN];	/* Volume label */
+	int32_t			de_id[2];	/* unique filesystem id */
+#define	HAS_UFSID(ppriv) \
+	((ppriv)->de_id[0] != 0 || (ppriv)->de_id[1] != 0)
 
 	int			de_ufs1:1;	/* UFS1 fs type */
 	int			de_su:1;	/* Soft Updates enabled */